andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-10-31 03:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit from fork

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/grpc/admin/idp_converter.go
+12 -10
View File
@@ -265,22 +265,24 @@ func updateGenericOIDCProviderToCommand(req *admin_pb.UpdateGenericOIDCProviderR
func addJWTProviderToCommand(req *admin_pb.AddJWTProviderRequest) command.JWTProvider {
return command.JWTProvider{
Name: req.Name,
Issuer: req.Issuer,
JWTEndpoint: req.JwtEndpoint,
KeyEndpoint: req.KeysEndpoint,
HeaderName: req.HeaderName,
Name: req.GetName(),
Issuer: req.GetIssuer(),
JWTEndpoint: req.GetJwtEndpoint(),
KeyEndpoint: req.GetKeysEndpoint(),
HeaderName: req.GetHeaderName(),
Audience: req.GetAudience(),
IDPOptions: idp_grpc.OptionsToCommand(req.ProviderOptions),
}
}
func updateJWTProviderToCommand(req *admin_pb.UpdateJWTProviderRequest) command.JWTProvider {
return command.JWTProvider{
Name: req.Name,
Issuer: req.Issuer,
JWTEndpoint: req.JwtEndpoint,
KeyEndpoint: req.KeysEndpoint,
HeaderName: req.HeaderName,
Name: req.GetName(),
Issuer: req.GetIssuer(),
JWTEndpoint: req.GetJwtEndpoint(),
KeyEndpoint: req.GetKeysEndpoint(),
HeaderName: req.GetHeaderName(),
Audience: req.GetAudience(),
IDPOptions: idp_grpc.OptionsToCommand(req.ProviderOptions),
}
}
internal/api/grpc/idp/converter.go
+1
View File
@@ -529,6 +529,7 @@ func jwtConfigToPb(providerConfig *idp_pb.ProviderConfig, template *query.JWTIDP
Issuer: template.Issuer,
KeysEndpoint: template.KeysEndpoint,
HeaderName: template.HeaderName,
Audience: template.Audience,
},
}
}
internal/api/grpc/idp/v2/query.go
+1
View File
@@ -197,6 +197,7 @@ func jwtConfigToPb(idpConfig *idp_pb.IDPConfig, template *query.JWTIDPTemplate)
Issuer: template.Issuer,
KeysEndpoint: template.KeysEndpoint,
HeaderName: template.HeaderName,
Audience: template.Audience,
},
}
}
internal/api/grpc/management/idp_converter.go
+12 -10
View File
@@ -258,22 +258,24 @@ func updateGenericOIDCProviderToCommand(req *mgmt_pb.UpdateGenericOIDCProviderRe
func addJWTProviderToCommand(req *mgmt_pb.AddJWTProviderRequest) command.JWTProvider {
return command.JWTProvider{
Name: req.Name,
Issuer: req.Issuer,
JWTEndpoint: req.JwtEndpoint,
KeyEndpoint: req.KeysEndpoint,
HeaderName: req.HeaderName,
Name: req.GetName(),
Issuer: req.GetIssuer(),
JWTEndpoint: req.GetJwtEndpoint(),
KeyEndpoint: req.GetKeysEndpoint(),
HeaderName: req.GetHeaderName(),
Audience: req.GetAudience(),
IDPOptions: idp_grpc.OptionsToCommand(req.ProviderOptions),
}
}
func updateJWTProviderToCommand(req *mgmt_pb.UpdateJWTProviderRequest) command.JWTProvider {
return command.JWTProvider{
Name: req.Name,
Issuer: req.Issuer,
JWTEndpoint: req.JwtEndpoint,
KeyEndpoint: req.KeysEndpoint,
HeaderName: req.HeaderName,
Name: req.GetName(),
Issuer: req.GetIssuer(),
JWTEndpoint: req.GetJwtEndpoint(),
KeyEndpoint: req.GetKeysEndpoint(),
HeaderName: req.GetHeaderName(),
Audience: req.GetAudience(),
IDPOptions: idp_grpc.OptionsToCommand(req.ProviderOptions),
}
}
internal/api/ui/login/external_provider_handler.go
+1
View File
@@ -1090,6 +1090,7 @@ func (l *Login) jwtProvider(identityProvider *query.IDPTemplate) (*jwt.Provider,
identityProvider.JWTIDPTemplate.Endpoint,
identityProvider.JWTIDPTemplate.KeysEndpoint,
identityProvider.JWTIDPTemplate.HeaderName,
identityProvider.JWTIDPTemplate.Audience,
l.idpConfigAlg,
)
}