CyberCoveLLC/threshold-ui
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 💡 update credential-library form for password type (#3060)

Browse Source 
* refactor: 💡 update credential-library form for password type

* style: 💄 fix display issue

* test: 💍 add test cases
This commit is contained in:
Lisbet Alvarez authored and Lisbet Alvarez committed 2025-11-18 11:20:49 -08:00
1 parent 6bb237e78c
commit accf9faf60
15 files changed
+186 -322
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ui/admin/app/components/form/credential-library/mapping-overrides/index.hbs
+33 -46
View File
@@ -3,49 +3,36 @@
SPDX-License-Identifier: BUSL-1.1
}}
<Form::Field::ListWrapper
@layout='horizontal'
@isOptional={{true}}
@disabled={{@disabled}}
>
<:fieldset as |F|>
<F.Legend>
{{t
'resources.credential-library.form.credential_mapping_overrides.label'
}}
</F.Legend>
<F.HelperText>
{{t
'resources.credential-library.form.credential_mapping_overrides.help'
}}
</F.HelperText>
{{#if @model.errors.credential_mapping_overrides}}
<F.Error as |E|>
{{#each @model.errors.credential_mapping_overrides as |error|}}
<E.Message>{{error.message}}</E.Message>
{{/each}}
</F.Error>
{{/if}}
</:fieldset>
<:field as |F|>
<F.KeyValue
@name='credential_mapping_overrides'
@model={{@model}}
@disabled={{@disabled}}
@width='100%'
@showNewRow={{this.showNewRow}}
>
<:newKey as |N|>
<N.select @selectOptions={{this.selectOptions}} />
</:newKey>
<:key as |K|>
<K.select @selectOptions={{this.mappingOverrides}} />
</:key>
<:value as |V|>
<V.text />
</:value>
</F.KeyValue>
</:field>
</Form::Field::ListWrapper>
<Hds::Form::Fieldset as |F|>
<F.Legend>{{t
'resources.credential-library.form.credential_mapping_overrides.label'
}}</F.Legend>
<F.HelperText>{{t
'resources.credential-library.form.credential_mapping_overrides.help'
}}</F.HelperText>
<F.Control>
{{#each this.mappingOverrides as |option|}}
<Hds::Form::TextInput::Field
name={{option}}
@value={{get @model.credential_mapping_overrides option}}
disabled={{@disabled}}
{{on
'input'
(set-from-event @model.credential_mapping_overrides option)
}}
as |F|
>
<F.Label>{{t
(concat 'resources.credential-library.titles.' option)
}}</F.Label>
</Hds::Form::TextInput::Field>
{{/each}}
</F.Control>
{{#if @model.errors.credential_mapping_overrides}}
<F.Error as |E|>
{{#each @model.errors.credential_mapping_overrides as |error|}}
<E.Message>{{error.message}}</E.Message>
{{/each}}
</F.Error>
{{/if}}
</Hds::Form::Fieldset>
ui/admin/app/components/form/credential-library/mapping-overrides/index.js
+2 -34
View File
@@ -5,43 +5,11 @@
import Component from '@glimmer/component';
import { options } from 'api/models/credential-library';
import { action } from '@ember/object';
export default class FormCredentialLibraryMappingOverridesComponent extends Component {
// =attributes
get mappingOverrides() {
return options.mapping_overrides[this.args.model.credential_type];
}
get allowedEntries() {
return this.mappingOverrides.length;
}
/**
* Prevents users from selecting duplicate keys from the select list if the arg is set to true
* @type {array}
*/
get selectOptions() {
const previouslySelectedKeys =
this.args.model.credential_mapping_overrides || [];
if (previouslySelectedKeys.length) {
return this.mappingOverrides.filter((key) =>
previouslySelectedKeys.every((obj) => obj.key !== key),
);
} else {
return this.mappingOverrides;
}
}
/**
* Determines if we need to show an empty row to the users to enter more key/value pairs based on removeDuplicates arg,
* by default it is true
* @type {object}
*/
@action
showNewRow() {
return (
this.args.model.credential_mapping_overrides?.length !==
this.allowedEntries
);
}
}
ui/admin/app/components/form/credential-library/radio/index.hbs
+1
View File
@@ -5,6 +5,7 @@
<Hds::Form::RadioCard::Group
@name={{t 'form.type.label'}}
@isRequired={{true}}
@alignment='center'
as |G|
>
ui/admin/app/components/form/credential-library/vault-generic/index.hbs
+1 -6
View File
@@ -14,7 +14,6 @@
name='name'
@value={{@model.name}}
@isInvalid={{@model.errors.name}}
@isOptional={{true}}
disabled={{form.disabled}}
{{on 'input' (set-from-event @model 'name')}}
as |F|
@@ -36,7 +35,6 @@
name='description'
@value={{@model.description}}
@isInvalid={{@model.errors.description}}
@isOptional={{true}}
disabled={{form.disabled}}
as |F|
>
@@ -70,7 +68,6 @@
<Hds::Form::TextInput::Field
@isRequired={{true}}
@isOptional={{false}}
@value={{@model.path}}
@isInvalid={{@model.errors.path}}
@type='text'
@@ -98,7 +95,6 @@
{{#if @model.isNew}}
<Hds::Form::Select::Field
@isOptional={{true}}
@width='100%'
name='credential_type'
disabled={{form.disabled}}
@@ -128,7 +124,7 @@
</F.Error>
{{/if}}
</Hds::Form::Select::Field>
{{else}}
{{else if @model.credential_type}}
<InfoField
@value={{t
(concat 'resources.credential-library.titles.' @model.credential_type)
@@ -179,7 +175,6 @@
{{#if this.isHttpRequestBodyAllowed}}
<Hds::Form::Textarea::Field
@isRequired={{true}}
@isOptional={{false}}
@value={{@model.http_request_body}}
@isInvalid={{@model.errors.http_request_body}}
name='http_request_body'
ui/admin/app/components/form/credential-library/vault-generic/index.js
+1 -1
View File
@@ -28,7 +28,7 @@ export default class FormCredentialLibraryVaultGenericComponent extends Componen
*/
@action
selectCredentialType({ target: { value } }) {
this.args.model.credential_mapping_overrides = [];
this.args.model.credential_mapping_overrides = {};
this.args.model.credential_type = value;
}
}
ui/admin/tests/acceptance/credential-library/create-test.js
+61 -95
View File
@@ -8,6 +8,7 @@ import { visit, click, fillIn, currentURL, select } from '@ember/test-helpers';
import { setupApplicationTest } from 'admin/tests/helpers';
import { setupSqlite } from 'api/test-support/helpers/sqlite';
import { Response } from 'miragejs';
import { faker } from '@faker-js/faker';
import {
TYPE_CREDENTIAL_LIBRARY_VAULT_SSH_CERTIFICATE,
TYPE_CREDENTIAL_LIBRARY_VAULT_LDAP,
@@ -15,7 +16,7 @@ import {
import * as selectors from './selectors';
import * as commonSelectors from 'admin/tests/helpers/selectors';
import { setRunOptions } from 'ember-a11y-testing/test-support';
import { TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN } from 'api/models/credential';
import { options } from 'api/models/credential-library';
module('Acceptance | credential-libraries | create', function (hooks) {
setupApplicationTest(hooks);
@@ -23,7 +24,7 @@ module('Acceptance | credential-libraries | create', function (hooks) {
let featuresService;
let getCredentialLibraryCount;
let getUsernamePasswordDomainCredentialLibraryCount;
let getTypeCredentialLibraryCount;
const instances = {
scopes: {
@@ -73,10 +74,9 @@ module('Acceptance | credential-libraries | create', function (hooks) {
// Generate resource counter
getCredentialLibraryCount = () =>
this.server.schema.credentialLibraries.all().models.length;
getUsernamePasswordDomainCredentialLibraryCount = () => {
return this.server.schema.credentialLibraries.where({
credentialType: TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN,
}).length;
getTypeCredentialLibraryCount = (credentialType) => {
return this.server.schema.credentialLibraries.where({ credentialType })
.length;
};
featuresService = this.owner.lookup('service:features');
});
@@ -100,102 +100,68 @@ module('Acceptance | credential-libraries | create', function (hooks) {
assert.strictEqual(currentURL(), urls.credentialLibrary);
});
test('can create a new credential library of type vault generic', async function (assert) {
setRunOptions({
rules: {
'color-contrast': {
// [ember-a11y-ignore]: axe rule "color-contrast" automatically ignored on 2025-08-01
enabled: false,
test.each(
'can create a new credential library with credential type for vault generic',
options.credential_types,
async function (assert, type) {
setRunOptions({
rules: {
'color-contrast': {
// [ember-a11y-ignore]: axe rule "color-contrast" automatically ignored on 2025-08-26
enabled: false,
},
},
},
});
});
const count = getCredentialLibraryCount();
await visit(urls.newCredentialLibrary);
const credentialLibraryCount = getCredentialLibraryCount();
const typeCredentialLibraryCount = getTypeCredentialLibraryCount(type);
await visit(urls.newCredentialLibrary);
await fillIn(commonSelectors.FIELD_NAME, commonSelectors.FIELD_NAME_VALUE);
await select(
selectors.FIELD_CRED_TYPE,
selectors.FIELD_CRED_TYPE_SSH_VALUE,
);
await select(
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT,
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT_SSH_VALUE,
);
await fillIn(selectors.FIELD_CRED_MAP_OVERRIDES_INPUT, 'key');
await click(selectors.FIELD_CRED_MAP_OVERRIDES_BTN);
await click(commonSelectors.SAVE_BTN);
await fillIn(
selectors.FIELD_VAULT_PATH,
selectors.FIELD_VAULT_PATH_VALUE,
);
await fillIn(
commonSelectors.FIELD_NAME,
commonSelectors.FIELD_NAME_VALUE,
);
await select(selectors.FIELD_CRED_TYPE, type);
assert.strictEqual(getCredentialLibraryCount(), count + 1);
const credentialLibrary = this.server.schema.credentialLibraries.findBy({
name: commonSelectors.FIELD_NAME_VALUE,
});
assert.strictEqual(
credentialLibrary.name,
commonSelectors.FIELD_NAME_VALUE,
);
assert.strictEqual(
credentialLibrary.credentialType,
selectors.FIELD_CRED_TYPE_SSH_VALUE,
);
assert.deepEqual(credentialLibrary.credentialMappingOverrides, {
private_key_attribute: 'key',
});
});
const credentialMappingOverrides = {};
options.mapping_overrides[type].forEach(async (overrideField) => {
const randName = faker.word.words();
credentialMappingOverrides[overrideField] = randName;
await fillIn(
selectors.FIELD_CRED_MAP_OVERRIDES(overrideField),
randName,
);
});
await click(commonSelectors.SAVE_BTN);
test('can create a new credential library with username, password and domain type for vault generic', async function (assert) {
setRunOptions({
rules: {
'color-contrast': {
// [ember-a11y-ignore]: axe rule "color-contrast" automatically ignored on 2025-08-26
enabled: false,
},
},
});
assert.strictEqual(
getCredentialLibraryCount(),
credentialLibraryCount + 1,
);
assert.strictEqual(
getTypeCredentialLibraryCount(),
typeCredentialLibraryCount + 1,
);
const credentialLibraryCount = getCredentialLibraryCount();
const usernamePasswordDomainCredentialLibraryCount =
getUsernamePasswordDomainCredentialLibraryCount();
await visit(urls.newCredentialLibrary);
const credentialLibrary = this.server.schema.credentialLibraries.findBy({
credentialType: type,
});
await fillIn(selectors.FIELD_VAULT_PATH, selectors.FIELD_VAULT_PATH_VALUE);
await fillIn(commonSelectors.FIELD_NAME, commonSelectors.FIELD_NAME_VALUE);
await select(
selectors.FIELD_CRED_TYPE,
selectors.FIELD_CRED_TYPE_UPD_VALUE,
);
await select(
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT,
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT_DOMAIN_VALUE,
);
await fillIn(selectors.FIELD_CRED_MAP_OVERRIDES_INPUT, 'domain');
await click(selectors.FIELD_CRED_MAP_OVERRIDES_BTN);
await click(commonSelectors.SAVE_BTN);
assert.strictEqual(getCredentialLibraryCount(), credentialLibraryCount + 1);
assert.strictEqual(
getUsernamePasswordDomainCredentialLibraryCount(),
usernamePasswordDomainCredentialLibraryCount + 1,
);
const credentialLibrary = this.server.schema.credentialLibraries.findBy({
credentialType: TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN,
});
assert.strictEqual(
credentialLibrary.name,
commonSelectors.FIELD_NAME_VALUE,
);
assert.strictEqual(
credentialLibrary.credentialType,
selectors.FIELD_CRED_TYPE_UPD_VALUE,
);
assert.deepEqual(credentialLibrary.credentialMappingOverrides, {
domain_attribute: 'domain',
});
});
assert.strictEqual(
credentialLibrary.name,
commonSelectors.FIELD_NAME_VALUE,
);
assert.strictEqual(credentialLibrary.credentialType, type);
assert.deepEqual(
credentialLibrary.credentialMappingOverrides,
credentialMappingOverrides,
);
},
);
test('can create a new credential library of type vault ssh cert', async function (assert) {
setRunOptions({
ui/admin/tests/acceptance/credential-library/selectors.js
+1 -9
View File
@@ -26,15 +26,7 @@ export const FIELD_TTL_VALUE = 'ttl';
export const FIELD_KEY_ID = '[name=key_id]';
export const FIELD_KEY_ID_VALUE = 'key_id';
export const FIELD_CRED_MAP_OVERRIDES_SELECT =
'[name="credential_mapping_overrides"] select';
export const FIELD_CRED_MAP_OVERRIDES_SELECT_SSH_VALUE =
'private_key_attribute';
export const FIELD_CRED_MAP_OVERRIDES_SELECT_DOMAIN_VALUE = 'domain_attribute';
export const FIELD_CRED_MAP_OVERRIDES_INPUT =
'[name="credential_mapping_overrides"] input';
export const FIELD_CRED_MAP_OVERRIDES_BTN =
'[name="credential_mapping_overrides"] button';
export const FIELD_CRED_MAP_OVERRIDES = (field) => `[name=${field}]`;
export const TYPE_VAULT_SSH_CERT = '[value="vault-ssh-certificate"]';
export const TYPE_VAULT_LDAP = '[value="vault-ldap"]';
ui/admin/tests/acceptance/credential-library/update-test.js
+65 -106
View File
@@ -4,19 +4,20 @@
*/
import { module, test } from 'qunit';
import { visit, click, fillIn, currentURL, select } from '@ember/test-helpers';
import { visit, click, fillIn, currentURL } from '@ember/test-helpers';
import { setupApplicationTest } from 'admin/tests/helpers';
import { setupSqlite } from 'api/test-support/helpers/sqlite';
import { Response } from 'miragejs';
import { faker } from '@faker-js/faker';
import * as selectors from './selectors';
import * as commonSelectors from 'admin/tests/helpers/selectors';
import { setRunOptions } from 'ember-a11y-testing/test-support';
import {
TYPE_CREDENTIAL_LIBRARY_VAULT_SSH_CERTIFICATE,
TYPE_CREDENTIAL_LIBRARY_VAULT_GENERIC,
TYPE_CREDENTIAL_LIBRARY_VAULT_LDAP,
} from 'api/models/credential-library';
import * as selectors from './selectors';
import * as commonSelectors from 'admin/tests/helpers/selectors';
import { setRunOptions } from 'ember-a11y-testing/test-support';
import { TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN } from 'api/models/credential';
import { options } from 'api/models/credential-library';
module('Acceptance | credential-libraries | update', function (hooks) {
setupApplicationTest(hooks);
@@ -57,17 +58,9 @@ module('Acceptance | credential-libraries | update', function (hooks) {
});
instances.credentialLibrary = this.server.create('credential-library', {
scope: instances.scopes.project,
type: TYPE_CREDENTIAL_LIBRARY_VAULT_GENERIC,
credentialStore: instances.credentialStore,
});
instances.usernamePasswordDomainCredentialLibrary = this.server.create(
'credential-library',
{
scope: instances.scopes.project,
credentialStore: instances.credentialStore,
type: TYPE_CREDENTIAL_LIBRARY_VAULT_GENERIC,
credential_type: TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN,
},
);
instances.vaultLDAPCredentialLibrary = this.server.create(
'credential-library',
{
@@ -86,7 +79,6 @@ module('Acceptance | credential-libraries | update', function (hooks) {
urls.credentialLibrary = `${urls.credentialLibraries}/${instances.credentialLibrary.id}`;
urls.newCredentialLibrary = `${urls.credentialLibraries}/new`;
urls.unknownCredentialLibrary = `${urls.credentialLibraries}/foo`;
urls.usernamePasswordDomainCredentialLibrary = `${urls.credentialLibraries}/${instances.usernamePasswordDomainCredentialLibrary.id}`;
urls.vaultLDAPCredentialLibrary = `${urls.credentialLibraries}/${instances.vaultLDAPCredentialLibrary.id}`;
});
@@ -126,100 +118,67 @@ module('Acceptance | credential-libraries | update', function (hooks) {
.hasValue(instances.credentialLibrary.name);
});
test('can update a vault generic credential library and save changes', async function (assert) {
setRunOptions({
rules: {
'color-contrast': {
// [ember-a11y-ignore]: axe rule "color-contrast" automatically ignored on 2025-08-01
enabled: false,
test.each(
'can update a vault generic credential library with credential type and save changes',
options.credential_types,
async function (assert, type) {
setRunOptions({
rules: {
'color-contrast': {
// [ember-a11y-ignore]: axe rule "color-contrast" automatically ignored on 2025-08-26
enabled: false,
},
},
},
});
});
instances.credentialLibrary.update({ credentialType: type });
await visit(urls.credentialLibraries);
await visit(urls.credentialLibrary);
await click(commonSelectors.HREF(urls.credentialLibrary));
await click(commonSelectors.EDIT_BTN);
await fillIn(
commonSelectors.FIELD_NAME,
commonSelectors.FIELD_NAME_VALUE,
);
await fillIn(
commonSelectors.FIELD_DESCRIPTION,
commonSelectors.FIELD_DESCRIPTION_VALUE,
);
await fillIn(
selectors.FIELD_VAULT_PATH,
selectors.FIELD_VAULT_PATH_VALUE,
);
const credentialMappingOverrides = {};
options.mapping_overrides[type].forEach(async (overrideField) => {
const randName = faker.word.words();
credentialMappingOverrides[overrideField] = randName;
await fillIn(
selectors.FIELD_CRED_MAP_OVERRIDES(overrideField),
randName,
);
});
await click(commonSelectors.SAVE_BTN);
await click(commonSelectors.EDIT_BTN);
await fillIn(commonSelectors.FIELD_NAME, commonSelectors.FIELD_NAME_VALUE);
await fillIn(
commonSelectors.FIELD_DESCRIPTION,
commonSelectors.FIELD_DESCRIPTION_VALUE,
);
await fillIn(selectors.FIELD_VAULT_PATH, selectors.FIELD_VAULT_PATH_VALUE);
await select(
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT,
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT_SSH_VALUE,
);
await fillIn(selectors.FIELD_CRED_MAP_OVERRIDES_INPUT, 'key');
await click(selectors.FIELD_CRED_MAP_OVERRIDES_BTN);
await click(commonSelectors.SAVE_BTN);
const credentialLibrary = this.server.schema.credentialLibraries.findBy({
name: commonSelectors.FIELD_NAME_VALUE,
});
assert.strictEqual(
credentialLibrary.name,
commonSelectors.FIELD_NAME_VALUE,
);
assert.strictEqual(
credentialLibrary.description,
commonSelectors.FIELD_DESCRIPTION_VALUE,
);
assert.strictEqual(
credentialLibrary.attributes.path,
selectors.FIELD_VAULT_PATH_VALUE,
);
assert.deepEqual(credentialLibrary.credentialMappingOverrides, {
private_key_attribute: 'key',
});
});
test('can update a vault generic credential library of username, password and domain type and save changes', async function (assert) {
setRunOptions({
rules: {
'color-contrast': {
// [ember-a11y-ignore]: axe rule "color-contrast" automatically ignored on 2025-08-26
enabled: false,
},
},
});
await visit(urls.usernamePasswordDomainCredentialLibrary);
await click(commonSelectors.EDIT_BTN);
await fillIn(commonSelectors.FIELD_NAME, commonSelectors.FIELD_NAME_VALUE);
await fillIn(
commonSelectors.FIELD_DESCRIPTION,
commonSelectors.FIELD_DESCRIPTION_VALUE,
);
await fillIn(selectors.FIELD_VAULT_PATH, selectors.FIELD_VAULT_PATH_VALUE);
await select(
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT,
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT_DOMAIN_VALUE,
);
await fillIn(selectors.FIELD_CRED_MAP_OVERRIDES_INPUT, 'domain');
await click(selectors.FIELD_CRED_MAP_OVERRIDES_BTN);
await click(commonSelectors.SAVE_BTN);
const credentialLibrary = this.server.schema.credentialLibraries.findBy({
credentialType: TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN,
});
assert.strictEqual(
credentialLibrary.name,
commonSelectors.FIELD_NAME_VALUE,
);
assert.strictEqual(
credentialLibrary.description,
commonSelectors.FIELD_DESCRIPTION_VALUE,
);
assert.strictEqual(
credentialLibrary.attributes.path,
selectors.FIELD_VAULT_PATH_VALUE,
);
assert.deepEqual(credentialLibrary.credentialMappingOverrides, {
domain_attribute: 'domain',
});
});
const credentialLibrary = this.server.schema.credentialLibraries.findBy({
credentialType: type,
});
assert.strictEqual(
credentialLibrary.name,
commonSelectors.FIELD_NAME_VALUE,
);
assert.strictEqual(
credentialLibrary.description,
commonSelectors.FIELD_DESCRIPTION_VALUE,
);
assert.strictEqual(
credentialLibrary.attributes.path,
selectors.FIELD_VAULT_PATH_VALUE,
);
assert.deepEqual(
credentialLibrary.credentialMappingOverrides,
credentialMappingOverrides,
);
},
);
test('saving an existing credential library with invalid fields displays error messages', async function (assert) {
setRunOptions({