Skip to content

Commit

Permalink
UI: Changes jwks_ca_pem param to a 'file' edit type (#24697)
Browse files Browse the repository at this point in the history
* change jwks_ca_pem to file edit type

* add changelog
  • Loading branch information
hellobontempo authored Jan 7, 2024
1 parent 3153673 commit ee0ccea
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
3 changes: 3 additions & 0 deletions changelog/24697.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
ui: Fixes input for jwks_ca_pem when configuring a JWT auth method
```
30 changes: 29 additions & 1 deletion ui/app/models/auth-config/jwt.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,31 @@ export default AuthConfig.extend({
oidcClientSecret: attr('string', {
label: 'OIDC client secret',
}),

oidcDiscoveryCaPem: attr('string', {
label: 'OIDC discovery CA PEM',
editType: 'file',
helpText:
'The CA certificate or chain of certificates, in PEM format, to use to validate connections to the OIDC Discovery URL. If not set, system certificates are used',
}),

jwksCaPem: attr('string', {
label: 'JWKS CA PEM',
editType: 'file',
}),

jwksUrl: attr('string', {
label: 'JWKS URL',
}),

oidcResponseMode: attr('string', {
label: 'OIDC response mode',
}),

oidcResponseTypes: attr('string', {
label: 'OIDC response types',
}),

jwtValidationPubkeys: attr({
label: 'JWT validation public keys',
editType: 'stringArray',
Expand All @@ -38,14 +57,23 @@ export default AuthConfig.extend({
jwtSupportedAlgs: attr({
label: 'JWT supported algorithms',
}),

boundIssuer: attr('string', {
helpText: 'The value against which to match the iss claim in a JWT',
}),

fieldGroups: computed('constructor.modelName', 'newFields', function () {
const type = this.constructor.modelName.split('/')[1].toUpperCase();
let groups = [
{
default: ['oidcDiscoveryUrl', 'defaultRole'],
default: [
'oidcDiscoveryUrl',
'defaultRole',
'jwksCaPem',
'jwksUrl',
'oidcResponseMode',
'oidcResponseTypes',
],
},
{
[`${type} Options`]: [
Expand Down

0 comments on commit ee0ccea

Please sign in to comment.