UI: Fix oidc auth method missing default_role field #28539
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:bug | ||
| ui: fix `default_role` input missing from oidc auth method configuration form | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,216 @@ | ||
| /** | ||
| * Copyright (c) HashiCorp, Inc. | ||
| * SPDX-License-Identifier: BUSL-1.1 | ||
| */ | ||
|
|
||
| import { module, test } from 'qunit'; | ||
| import { setupApplicationTest } from 'ember-qunit'; | ||
| import { v4 as uuidv4 } from 'uuid'; | ||
|
|
||
| import { login } from 'vault/tests/helpers/auth/auth-helpers'; | ||
| import { visit } from '@ember/test-helpers'; | ||
| import { deleteAuthCmd, runCmd } from 'vault/tests/helpers/commands'; | ||
| import testHelper from './test-helper'; | ||
| import { GENERAL } from 'vault/tests/helpers/general-selectors'; | ||
|
|
||
| // These models use openAPI so we assert the form inputs using an acceptance test | ||
| // The default selector is to use GENERAL.inputByAttr() | ||
| // custom fields should be added to the this.customSelectorss object | ||
| module('Acceptance | auth enable tune form test', function (hooks) { | ||
|
There was a problem hiding this comment. I only added tests for azure, jwt, oidc, okta and ldap for now. We can expand as needed |
||
| setupApplicationTest(hooks); | ||
| hooks.beforeEach(async function () { | ||
| // these tend to be the same across models because they share the same mount-config model | ||
| // if necessary, they can be overridden in the individual module | ||
| this.mountFields = [ | ||
| 'path', | ||
| 'description', | ||
| 'local', | ||
| 'sealWrap', | ||
| 'config.listingVisibility', | ||
| 'config.defaultLeaseTtl', | ||
| 'config.maxLeaseTtl', | ||
| 'config.tokenType', | ||
| 'config.auditNonHmacRequestKeys', | ||
| 'config.auditNonHmacResponseKeys', | ||
| 'config.passthroughRequestHeaders', | ||
| 'config.allowedResponseHeaders', | ||
| 'config.pluginVersion', | ||
| ]; | ||
| }); | ||
|
|
||
| module('azure', function (hooks) { | ||
| hooks.beforeEach(async function () { | ||
| this.type = 'azure'; | ||
| this.path = `${this.type}-${uuidv4()}`; | ||
| this.tuneFields = [ | ||
| 'environment', | ||
| 'identityTokenAudience', | ||
| 'identityTokenTtl', | ||
| 'maxRetries', | ||
| 'maxRetryDelay', | ||
| 'resource', | ||
| 'retryDelay', | ||
| 'rootPasswordTtl', | ||
| 'tenantId', | ||
| ]; | ||
| this.tuneToggles = { 'Azure Options': ['clientId', 'clientSecret'] }; | ||
| await login(); | ||
| return visit('/vault/settings/auth/enable'); | ||
| }); | ||
| hooks.afterEach(async function () { | ||
| await runCmd(deleteAuthCmd(this.path), false); | ||
| }); | ||
| testHelper(test); | ||
| }); | ||
|
|
||
| module('jwt', function (hooks) { | ||
| hooks.beforeEach(async function () { | ||
| this.type = 'jwt'; | ||
| this.path = `${this.type}-${uuidv4()}`; | ||
| this.customSelectors = { | ||
| providerConfig: `${GENERAL.fieldByAttr('providerConfig')} textarea`, | ||
| }; | ||
| this.tuneFields = [ | ||
| 'defaultRole', | ||
| 'jwksCaPem', | ||
| 'jwksUrl', | ||
| 'namespaceInState', | ||
| 'oidcDiscoveryUrl', | ||
| 'oidcResponseMode', | ||
| 'oidcResponseTypes', | ||
| 'providerConfig', | ||
| 'unsupportedCriticalCertExtensions', | ||
| ]; | ||
| this.tuneToggles = { | ||
| 'JWT Options': [ | ||
| 'oidcClientId', | ||
| 'oidcClientSecret', | ||
| 'oidcDiscoveryCaPem', | ||
| 'jwtValidationPubkeys', | ||
| 'jwtSupportedAlgs', | ||
| 'boundIssuer', | ||
| ], | ||
| }; | ||
| await login(); | ||
| return visit('/vault/settings/auth/enable'); | ||
| }); | ||
| hooks.afterEach(async function () { | ||
| await runCmd(deleteAuthCmd(this.path), false); | ||
| }); | ||
| testHelper(test); | ||
| }); | ||
|
|
||
| module('ldap', function (hooks) { | ||
| hooks.beforeEach(async function () { | ||
| this.type = 'ldap'; | ||
| this.path = `${this.type}-${uuidv4()}`; | ||
| this.tuneFields = [ | ||
| 'url', | ||
| 'caseSensitiveNames', | ||
| 'connectionTimeout', | ||
| 'dereferenceAliases', | ||
| 'maxPageSize', | ||
| 'passwordPolicy', | ||
| 'requestTimeout', | ||
| 'tokenBoundCidrs', | ||
| 'tokenExplicitMaxTtl', | ||
| 'tokenMaxTtl', | ||
| 'tokenNoDefaultPolicy', | ||
| 'tokenNumUses', | ||
| 'tokenPeriod', | ||
| 'tokenPolicies', | ||
| 'tokenTtl', | ||
| 'tokenType', | ||
| 'usePre111GroupCnBehavior', | ||
| 'usernameAsAlias', | ||
| ]; | ||
| this.tuneToggles = { | ||
| 'LDAP Options': [ | ||
| 'starttls', | ||
| 'insecureTls', | ||
| 'discoverdn', | ||
| 'denyNullBind', | ||
| 'tlsMinVersion', | ||
| 'tlsMaxVersion', | ||
| 'certificate', | ||
| 'clientTlsCert', | ||
| 'clientTlsKey', | ||
| 'userattr', | ||
| 'upndomain', | ||
| 'anonymousGroupSearch', | ||
| ], | ||
| 'Customize User Search': ['binddn', 'userdn', 'bindpass', 'userfilter'], | ||
| 'Customize Group Membership Search': ['groupfilter', 'groupattr', 'groupdn', 'useTokenGroups'], | ||
| }; | ||
| await login(); | ||
| return visit('/vault/settings/auth/enable'); | ||
| }); | ||
| hooks.afterEach(async function () { | ||
| await runCmd(deleteAuthCmd(this.path), false); | ||
| }); | ||
| testHelper(test); | ||
| }); | ||
|
|
||
| module('oidc', function (hooks) { | ||
| hooks.beforeEach(async function () { | ||
| this.type = 'oidc'; | ||
| this.path = `${this.type}-${uuidv4()}`; | ||
| this.customSelectors = { | ||
| providerConfig: `${GENERAL.fieldByAttr('providerConfig')} textarea`, | ||
| }; | ||
| this.tuneFields = [ | ||
| 'oidcDiscoveryUrl', | ||
| 'defaultRole', | ||
| 'jwksCaPem', | ||
| 'jwksUrl', | ||
| 'oidcResponseMode', | ||
| 'oidcResponseTypes', | ||
| 'namespaceInState', | ||
| 'providerConfig', | ||
| 'unsupportedCriticalCertExtensions', | ||
| ]; | ||
| this.tuneToggles = { | ||
| 'OIDC Options': [ | ||
| 'oidcClientId', | ||
| 'oidcClientSecret', | ||
| 'oidcDiscoveryCaPem', | ||
| 'jwtValidationPubkeys', | ||
| 'jwtSupportedAlgs', | ||
| 'boundIssuer', | ||
| ], | ||
| }; | ||
| await login(); | ||
| return visit('/vault/settings/auth/enable'); | ||
| }); | ||
| hooks.afterEach(async function () { | ||
| await runCmd(deleteAuthCmd(this.path), false); | ||
| }); | ||
| testHelper(test); | ||
| }); | ||
|
|
||
| module('okta', function (hooks) { | ||
| hooks.beforeEach(async function () { | ||
| this.type = 'okta'; | ||
| this.path = `${this.type}-${uuidv4()}`; | ||
| this.tuneFields = [ | ||
| 'orgName', | ||
| 'tokenBoundCidrs', | ||
| 'tokenExplicitMaxTtl', | ||
| 'tokenMaxTtl', | ||
| 'tokenNoDefaultPolicy', | ||
| 'tokenNumUses', | ||
| 'tokenPeriod', | ||
| 'tokenPolicies', | ||
| 'tokenTtl', | ||
| 'tokenType', | ||
| ]; | ||
| this.tuneToggles = { Options: ['apiToken', 'baseUrl', 'bypassOktaMfa'] }; | ||
| await login(); | ||
| return visit('/vault/settings/auth/enable'); | ||
| }); | ||
| hooks.afterEach(async function () { | ||
| await runCmd(deleteAuthCmd(this.path), false); | ||
| }); | ||
| testHelper(test); | ||
| }); | ||
| }); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /** | ||
| * Copyright (c) HashiCorp, Inc. | ||
| * SPDX-License-Identifier: BUSL-1.1 | ||
| */ | ||
|
|
||
| import { click, currentURL, fillIn } from '@ember/test-helpers'; | ||
| import { GENERAL } from 'vault/tests/helpers/general-selectors'; | ||
|
|
||
| const SELECTORS = { | ||
| mountType: (name) => `[data-test-mount-type="${name}"]`, | ||
| submit: '[data-test-mount-submit]', | ||
| }; | ||
|
|
||
| const assertFields = (assert, fields, customSelectors = {}) => { | ||
| fields.forEach((param) => { | ||
| if (Object.keys(customSelectors).includes(param)) { | ||
| assert.dom(customSelectors[param]).exists(); | ||
| } else { | ||
| assert.dom(GENERAL.inputByAttr(param)).exists(); | ||
| } | ||
| }); | ||
| }; | ||
| export default (test) => { | ||
| test('it renders mount fields', async function (assert) { | ||
| await click(SELECTORS.mountType(this.type)); | ||
| await click(GENERAL.toggleGroup('Method Options')); | ||
| assertFields(assert, this.mountFields, this.customSelectors); | ||
| }); | ||
|
|
||
| test('it renders tune fields', async function (assert) { | ||
| // enable auth method to check tune fields | ||
| await click(SELECTORS.mountType(this.type)); | ||
| await fillIn(GENERAL.inputByAttr('path'), this.path); | ||
| await click(SELECTORS.submit); | ||
| assert.strictEqual( | ||
| currentURL(), | ||
| `/vault/settings/auth/configure/${this.path}/configuration`, | ||
| `${this.type}: it mounts navigates to tune form` | ||
| ); | ||
|
|
||
| assertFields(assert, this.tuneFields, this.customSelectors); | ||
|
|
||
| for (const toggle in this.tuneToggles) { | ||
| const fields = this.tuneToggles[toggle]; | ||
| await click(GENERAL.toggleGroup(toggle)); | ||
| assertFields(assert, fields, this.customSelectors); | ||
| } | ||
| }); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
alphabetized!