Merge commit from fork

* feat(jwt idp): manage and validate audience

* translations

* fix tests

* address comments

* update migration version

* fix merge
This commit is contained in:
Livio Spring
2026-06-15 15:27:47 +02:00
committed by GitHub
parent fad02c6d9f
commit d184e976fc
57 changed files with 379 additions and 55 deletions
+14
View File
@@ -6542,6 +6542,13 @@ message AddJWTProviderRequest {
string keys_endpoint = 4 [(validate.rules).string = {min_len: 1, max_len: 200}];
string header_name = 5 [(validate.rules).string = {min_len: 1, max_len: 200}];
zitadel.idp.v1.Options provider_options = 6;
string audience = 7 [
(validate.rules).string = {max_len: 200},
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
example: "\"my-audience\"";
description: "the expected audience in the JWT, if not provided the audience is not validated";
}
];
}
message AddJWTProviderResponse {
@@ -6562,6 +6569,13 @@ message UpdateJWTProviderRequest {
string keys_endpoint = 5 [(validate.rules).string = {max_len: 200}];
string header_name = 6 [(validate.rules).string = {min_len: 1, max_len: 200}];
zitadel.idp.v1.Options provider_options = 7;
string audience = 8 [
(validate.rules).string = {max_len: 200},
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
example: "\"my-audience\"";
description: "the expected audience in the JWT, if not provided the audience is not validated";
}
];
}
message UpdateJWTProviderResponse {
+7
View File
@@ -195,6 +195,13 @@ message JWTConfig {
description: "the name of the header where the JWT is sent in, default is authorization";
}
];
string audience = 5 [
(validate.rules).string = {max_len: 200},
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
example: "\"my-audience\"";
description: "the expected audience in the JWT, if not provided the audience is not validated";
}
];
}
message IDPIDQuery {
+7
View File
@@ -133,6 +133,13 @@ message JWTConfig {
"\"x-auth-token\"";
}
];
// The audience is the expected audience in the JWT, if not configured, the audience is not validated.
string audience = 5 [
(validate.rules).string = {max_len: 200},
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
example: "\"my-audience\"";
}
];
}
message OAuthConfig {
+14
View File
@@ -13291,6 +13291,13 @@ message AddJWTProviderRequest {
string keys_endpoint = 4 [(validate.rules).string = {min_len: 1, max_len: 200}];
string header_name = 5 [(validate.rules).string = {min_len: 1, max_len: 200}];
zitadel.idp.v1.Options provider_options = 6;
string audience = 7 [
(validate.rules).string = {max_len: 200},
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
example: "\"my-audience\"";
description: "the expected audience in the JWT, if not provided the audience is not validated";
}
];
}
message AddJWTProviderResponse {
@@ -13311,6 +13318,13 @@ message UpdateJWTProviderRequest {
string keys_endpoint = 5 [(validate.rules).string = {max_len: 200}];
string header_name = 6 [(validate.rules).string = {min_len: 1, max_len: 200}];
zitadel.idp.v1.Options provider_options = 7;
string audience = 8 [
(validate.rules).string = {max_len: 200},
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
example: "\"my-audience\"";
description: "the expected audience in the JWT, if not provided the audience is not validated";
}
];
}
message UpdateJWTProviderResponse {