From ce01358a7eb977b9db938050a3f32d81356e3bde Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Tue, 17 Aug 2021 15:07:28 -0700 Subject: [PATCH 1/7] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20path=20transi?= =?UTF-8?q?tive=20dep.=20to=20yarn=20resolutions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add path-parse transitive dependency to yarn resolutions to fix a security vulnerability with older versions of that library. --- package.json | 3 ++- ui/desktop/electron-app/package.json | 3 ++- ui/desktop/electron-app/yarn.lock | 16 ++++++++-------- yarn.lock | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 303f2c21f..a96317204 100755 --- a/package.json +++ b/package.json @@ -77,7 +77,8 @@ "normalize-url": "^4.5.1", "glob-parent": "^5.1.2", "tar": "^6.1.2", - "xmldom": "github:xmldom/xmldom#0.7.0" + "xmldom": "github:xmldom/xmldom#0.7.0", + "path-parse": "^1.0.7" }, "config": { "commitizen": { diff --git a/ui/desktop/electron-app/package.json b/ui/desktop/electron-app/package.json index d06bbd054..2a1d4a2a5 100644 --- a/ui/desktop/electron-app/package.json +++ b/ui/desktop/electron-app/package.json @@ -46,6 +46,7 @@ "yargs-parser": "~20.2.7", "trim-newlines": "^3.0.1", "normalize-url": "^4.5.1", - "jszip": "^3.7.0" + "jszip": "^3.7.0", + "path-parse": "^1.0.7" } } diff --git a/ui/desktop/electron-app/yarn.lock b/ui/desktop/electron-app/yarn.lock index 4da075baf..ed7fb79aa 100644 --- a/ui/desktop/electron-app/yarn.lock +++ b/ui/desktop/electron-app/yarn.lock @@ -2080,10 +2080,10 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jszip@^3.1.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9" - integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ== +jszip@^3.1.0, jszip@^3.7.0: + version "3.7.1" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9" + integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg== dependencies: lie "~3.3.0" pako "~1.0.2" @@ -2802,10 +2802,10 @@ path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== +path-parse@^1.0.6, path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-type@^1.0.0: version "1.1.0" diff --git a/yarn.lock b/yarn.lock index d398e26ee..e356bc3d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16701,7 +16701,7 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6: +path-parse@^1.0.6, path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== From 39ec40d488012bee1f0f432e549db31970e998ec Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 17 Aug 2021 15:16:28 -0700 Subject: [PATCH 2/7] desktop target read capability --- .../scopes/scope/projects/targets/index.hbs | 14 +++++++++----- .../tests/acceptance/projects/targets-test.js | 8 ++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs index 99ca234d9..f7fd23120 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs @@ -24,12 +24,16 @@ {{#each @model as |model|}} - + {{#if (can 'read model' model)}} + + {{model.displayName}} + + {{else}} {{model.displayName}} - + {{/if}} {{#if model.target.description}}

{{model.target.description}}

{{/if}} diff --git a/ui/desktop/tests/acceptance/projects/targets-test.js b/ui/desktop/tests/acceptance/projects/targets-test.js index 2fb027eec..898a04222 100644 --- a/ui/desktop/tests/acceptance/projects/targets-test.js +++ b/ui/desktop/tests/acceptance/projects/targets-test.js @@ -209,6 +209,14 @@ module('Acceptance | projects | targets', function (hooks) { await visit(urls.targets); }); + test('cannot navigate to an account form without proper authorization', async function (assert) { + assert.expect(1); + instances.target.authorized_actions = + instances.target.authorized_actions.filter((item) => item !== 'read'); + await visit(urls.target); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); + test('connecting to a target', async function (assert) { assert.expect(4); stubs.ipcService.withArgs('cliExists').returns(true); From 025297c619524a637b96f16298173e6acc381ea6 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 17 Aug 2021 15:23:23 -0700 Subject: [PATCH 3/7] desktop target read capability --- .../scopes/scope/users/user/-actions.hbs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs b/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs index 280fd98bb..4f993d425 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs @@ -1,12 +1,12 @@ - - - {{t 'resources.user.actions.add-accounts'}} - - {{#if (can 'delete model' @model)}} +{{#if (can 'delete model' @model)}} + + + {{t 'resources.user.actions.add-accounts'}} + {{t 'resources.user.actions.delete'}} - {{/if}} - \ No newline at end of file + +{{/if}} \ No newline at end of file From c1654180c4fb07a3fe577b6ba76d7ae2f5331a8f Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 17 Aug 2021 16:15:37 -0700 Subject: [PATCH 4/7] Update targets-test.js --- ui/desktop/tests/acceptance/projects/targets-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/desktop/tests/acceptance/projects/targets-test.js b/ui/desktop/tests/acceptance/projects/targets-test.js index 898a04222..6e1429884 100644 --- a/ui/desktop/tests/acceptance/projects/targets-test.js +++ b/ui/desktop/tests/acceptance/projects/targets-test.js @@ -209,7 +209,7 @@ module('Acceptance | projects | targets', function (hooks) { await visit(urls.targets); }); - test('cannot navigate to an account form without proper authorization', async function (assert) { + test('cannot navigate to a target without proper authorization', async function (assert) { assert.expect(1); instances.target.authorized_actions = instances.target.authorized_actions.filter((item) => item !== 'read'); From 2545753c2cb7637285dcf183cfb192f095b42ad5 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 17 Aug 2021 23:27:45 -0700 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/desktop/tests/acceptance/projects/targets-test.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ui/desktop/tests/acceptance/projects/targets-test.js b/ui/desktop/tests/acceptance/projects/targets-test.js index 898a04222..b19ec797a 100644 --- a/ui/desktop/tests/acceptance/projects/targets-test.js +++ b/ui/desktop/tests/acceptance/projects/targets-test.js @@ -209,12 +209,15 @@ module('Acceptance | projects | targets', function (hooks) { await visit(urls.targets); }); - test('cannot navigate to an account form without proper authorization', async function (assert) { + test('cannot navigate to a target form without proper authorization', async function (assert) { assert.expect(1); - instances.target.authorized_actions = - instances.target.authorized_actions.filter((item) => item !== 'read'); + later(async () => { + run.cancelTimers(); + instances.target.authorized_actions = + instances.target.authorized_actions.filter((item) => item !== 'read'); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }, 750); await visit(urls.target); - assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); }); test('connecting to a target', async function (assert) { From 884a0ebbc5728c87ea49e25832dfdea62e58e84f Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 19 Aug 2021 14:19:03 -0700 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20update=20route?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/desktop/tests/acceptance/projects/targets-test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/desktop/tests/acceptance/projects/targets-test.js b/ui/desktop/tests/acceptance/projects/targets-test.js index b5b241788..bb253dd45 100644 --- a/ui/desktop/tests/acceptance/projects/targets-test.js +++ b/ui/desktop/tests/acceptance/projects/targets-test.js @@ -211,13 +211,13 @@ module('Acceptance | projects | targets', function (hooks) { test('cannot navigate to a target without proper authorization', async function (assert) { assert.expect(1); + instances.target.authorized_actions = + instances.target.authorized_actions.filter((item) => item !== 'read'); later(async () => { run.cancelTimers(); - instances.target.authorized_actions = - instances.target.authorized_actions.filter((item) => item !== 'read'); assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); }, 750); - await visit(urls.target); + await visit(urls.targets); }); test('connecting to a target', async function (assert) { From 876fc0c71fe1246153b7e9b3bb2df10ec0d755f4 Mon Sep 17 00:00:00 2001 From: dharini Date: Mon, 23 Aug 2021 15:55:20 -0700 Subject: [PATCH 7/7] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20cred=20store=20capab?= =?UTF-8?q?ilities?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/mirage/factories/credential-store.js | 8 + .../form/credential-store/index.hbs | 15 +- .../credential-store/-actions.hbs | 18 +- .../scopes/scope/credential-stores/index.hbs | 14 +- .../credential-store/delete-test.js | 124 ++++++++++++ .../acceptance/credential-store/read-test.js | 84 ++++++++ .../credential-store/update-test.js | 170 +++++++++++++++++ .../acceptance/credential-stores-test.js | 179 ------------------ 8 files changed, 413 insertions(+), 199 deletions(-) create mode 100644 ui/admin/tests/acceptance/credential-store/delete-test.js create mode 100644 ui/admin/tests/acceptance/credential-store/read-test.js create mode 100644 ui/admin/tests/acceptance/credential-store/update-test.js diff --git a/addons/api/mirage/factories/credential-store.js b/addons/api/mirage/factories/credential-store.js index d1b037c7d..15ac2b200 100644 --- a/addons/api/mirage/factories/credential-store.js +++ b/addons/api/mirage/factories/credential-store.js @@ -1,10 +1,18 @@ import factory from '../generated/factories/credential-store'; import { random, internet, datatype } from 'faker'; import { trait } from 'ember-cli-mirage'; +import permissions from '../helpers/permissions'; const types = ['vault']; export default factory.extend({ + authorized_actions: () => + permissions.authorizedActionsFor('credential-store') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], id: (i) => `credential-store-id-${i}`, type: (i) => types[i % types.length], diff --git a/ui/admin/app/components/form/credential-store/index.hbs b/ui/admin/app/components/form/credential-store/index.hbs index c77bfb410..4da5e3ad3 100644 --- a/ui/admin/app/components/form/credential-store/index.hbs +++ b/ui/admin/app/components/form/credential-store/index.hbs @@ -233,11 +233,12 @@ {{/if}} - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs index c08355da6..bf81de1ab 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs @@ -9,12 +9,14 @@ > {{t 'resources.credential-library.actions.create'}} - - - {{t 'resources.credential-store.actions.delete'}} - + {{#if (can 'delete model' @model)}} + + + {{t 'resources.credential-store.actions.delete'}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs index e614dd097..faa489b0b 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs @@ -39,12 +39,16 @@ {{#each @model as |credentialStore|}} - + {{#if (can 'read model' credentialStore)}} + + {{credentialStore.displayName}} + + {{else}} {{credentialStore.displayName}} - + {{/if}}

{{credentialStore.description}}

 diff --git a/ui/admin/tests/acceptance/credential-store/delete-test.js b/ui/admin/tests/acceptance/credential-store/delete-test.js new file mode 100644 index 000000000..67f689357 --- /dev/null +++ b/ui/admin/tests/acceptance/credential-store/delete-test.js @@ -0,0 +1,124 @@ +import { module, test } from 'qunit'; +import { visit, find, click } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { authenticateSession } from 'ember-simple-auth/test-support'; +import { Response } from 'miragejs'; +import { resolve, reject } from 'rsvp'; +import sinon from 'sinon'; + +module('Acceptance | credential-stores | delete', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + let getCredentialStoresCount; + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + }; + + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + credentialStores: null, + credentialStore: null, + unknownCredentialStore: null, + newCredentialStore: null, + }; + + hooks.beforeEach(function () { + // Generate resources + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + instances.credentialStore = this.server.create('credential-store', { + scope: instances.scopes.project, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.credentialStores = `${urls.projectScope}/credential-stores`; + urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`; + urls.unknownCredentialStore = `${urls.credentialStores}/foo`; + urls.newCredentialStore = `${urls.credentialStores}/new`; + // Generate resource counter + getCredentialStoresCount = () => { + return this.server.schema.credentialStores.all().models.length; + }; + authenticateSession({}); + }); + + test('can delete credential store', async function (assert) { + assert.expect(1); + const count = getCredentialStoresCount(); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getCredentialStoresCount(), count - 1); + }); + + test('cannot delete a credential store without proper authorization', async function (assert) { + assert.expect(1); + instances.credentialStore.authorized_actions = + instances.credentialStore.authorized_actions.filter( + (item) => item !== 'delete' + ); + await visit(urls.credentialStores); + assert.notOk( + find('.rose-layout-page-actions .rose-dropdown-button-danger') + ); + }); + + test('can accept delete credential store via dialog', async function (assert) { + assert.expect(2); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + confirmService.confirm = sinon.fake.returns(resolve()); + const count = getCredentialStoresCount(); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getCredentialStoresCount(), count - 1); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('cannot cancel delete credential store via dialog', async function (assert) { + assert.expect(2); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + confirmService.confirm = sinon.fake.returns(reject()); + const count = getCredentialStoresCount(); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getCredentialStoresCount(), count); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('deleting a credential store which errors displays error messages', async function (assert) { + assert.expect(1); + this.server.del('/credential-stores/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.'); + }); +}); diff --git a/ui/admin/tests/acceptance/credential-store/read-test.js b/ui/admin/tests/acceptance/credential-store/read-test.js new file mode 100644 index 000000000..dd204b41d --- /dev/null +++ b/ui/admin/tests/acceptance/credential-store/read-test.js @@ -0,0 +1,84 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import a11yAudit from 'ember-a11y-testing/test-support/audit'; +import { authenticateSession } from 'ember-simple-auth/test-support'; + +module('Acceptance | credential-stores | read', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + }; + + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + credentialStores: null, + credentialStore: null, + unknownCredentialStore: null, + newCredentialStore: null, + }; + + hooks.beforeEach(function () { + // Generate resources + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + instances.credentialStore = this.server.create('credential-store', { + scope: instances.scopes.project, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.credentialStores = `${urls.projectScope}/credential-stores`; + urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`; + urls.unknownCredentialStore = `${urls.credentialStores}/foo`; + urls.newCredentialStore = `${urls.credentialStores}/new`; + authenticateSession({}); + }); + + test('visiting /credential-stores', async function (assert) { + assert.expect(2); + await visit(urls.credentialStores); + await a11yAudit(); + assert.equal(currentURL(), urls.credentialStores); + await visit(urls.credentialStore); + await a11yAudit(); + assert.equal(currentURL(), urls.credentialStore); + }); + + test('cannot navigate to a credential store form without proper authorization', async function (assert) { + assert.expect(1); + instances.credentialStore.authorized_actions = + instances.credentialStore.authorized_actions.filter( + (item) => item !== 'read' + ); + await visit(urls.credentialStores); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); + + test('visiting an unknown credential store display 404 message', async function (assert) { + assert.expect(1); + await visit(urls.unknownCredentialStore); + await a11yAudit(); + assert.equal( + find('.rose-message-subtitle').textContent.trim(), + 'Error 404' + ); + }); +}); diff --git a/ui/admin/tests/acceptance/credential-store/update-test.js b/ui/admin/tests/acceptance/credential-store/update-test.js new file mode 100644 index 000000000..25f694cdb --- /dev/null +++ b/ui/admin/tests/acceptance/credential-store/update-test.js @@ -0,0 +1,170 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, find, click, fillIn } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { authenticateSession } from 'ember-simple-auth/test-support'; +import { Response } from 'miragejs'; + +module('Acceptance | credential-stores | update', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + }; + + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + credentialStores: null, + credentialStore: null, + unknownCredentialStore: null, + newCredentialStore: null, + }; + + hooks.beforeEach(function () { + // Generate resources + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + instances.credentialStore = this.server.create('credential-store', { + scope: instances.scopes.project, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.credentialStores = `${urls.projectScope}/credential-stores`; + urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`; + urls.unknownCredentialStore = `${urls.credentialStores}/foo`; + urls.newCredentialStore = `${urls.credentialStores}/new`; + authenticateSession({}); + }); + + test('can save changes to existing credential store', async function (assert) { + assert.expect(3); + assert.notEqual(instances.credentialStore.name, 'random string'); + await visit(urls.credentialStore); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('.rose-form-actions [type="submit"]'); + assert.equal(currentURL(), urls.credentialStore); + assert.equal( + this.server.schema.credentialStores.all().models[0].name, + 'random string' + ); + }); + + test('cannot make changes to an existing credential store without proper authorization', async function (assert) { + assert.expect(1); + instances.credentialStore.authorized_actions = + instances.credentialStore.authorized_actions.filter( + (item) => item !== 'update' + ); + await visit(urls.credentialStore); + assert.notOk(find('.rose-layout-page-actions .rose-button-secondary')); + }); + + test('can cancel changes to existing credential store', async function (assert) { + assert.expect(2); + await visit(urls.credentialStore); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('.rose-form-actions [type="button"]'); + assert.notEqual(instances.credentialStore.name, 'random string'); + assert.equal(find('[name="name"]').value, instances.credentialStore.name); + }); + + test('saving an existing credential store with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/credential-stores/:id', () => { + return new Response( + 400, + {}, + { + status: 400, + code: 'invalid_argument', + message: 'The request was invalid.', + details: { + request_fields: [ + { + name: 'name', + description: 'Name is required.', + }, + ], + }, + } + ); + }); + await visit(urls.credentialStore); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('[type="submit"]'); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'The request was invalid.' + ); + assert.ok( + find('.rose-form-error-message').textContent.trim(), + 'Name is required.' + ); + }); + + test('can discard unsaved credential store changes via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.credentialStore.name, 'random string'); + + await visit(urls.credentialStore); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.credentialStore); + + try { + await visit(urls.credentialStores); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:first-child', 'Click Discard'); + assert.equal(currentURL(), urls.credentialStores); + assert.notEqual( + this.server.schema.credentialStores.all().models[0].name, + 'random string' + ); + } + }); + + test('can cancel discard unsaved credential store via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.credentialStore.name, 'random string'); + await visit(urls.credentialStore); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.credentialStore); + + try { + await visit(urls.credentialStores); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:last-child'); + assert.equal(currentURL(), urls.credentialStore); + assert.notEqual( + this.server.schema.credentialStores.all().models[0].name, + 'random string' + ); + } + }); +}); diff --git a/ui/admin/tests/acceptance/credential-stores-test.js b/ui/admin/tests/acceptance/credential-stores-test.js index 3979f664e..54764b5a3 100644 --- a/ui/admin/tests/acceptance/credential-stores-test.js +++ b/ui/admin/tests/acceptance/credential-stores-test.js @@ -2,11 +2,8 @@ import { module, test } from 'qunit'; import { visit, currentURL, find, click, fillIn } from '@ember/test-helpers'; import { setupApplicationTest } from 'ember-qunit'; import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; -import a11yAudit from 'ember-a11y-testing/test-support/audit'; import { authenticateSession } from 'ember-simple-auth/test-support'; import { Response } from 'miragejs'; -import { resolve, reject } from 'rsvp'; -import sinon from 'sinon'; module('Acceptance | credential-stores', function (hooks) { setupApplicationTest(hooks); @@ -61,26 +58,6 @@ module('Acceptance | credential-stores', function (hooks) { authenticateSession({}); }); - test('visiting /credential-stores', async function (assert) { - assert.expect(2); - await visit(urls.credentialStores); - await a11yAudit(); - assert.equal(currentURL(), urls.credentialStores); - await visit(urls.credentialStore); - await a11yAudit(); - assert.equal(currentURL(), urls.credentialStore); - }); - - test('visiting an unknown credential store display 404 message', async function (assert) { - assert.expect(1); - await visit(urls.unknownCredentialStore); - await a11yAudit(); - assert.equal( - find('.rose-message-subtitle').textContent.trim(), - 'Error 404' - ); - }); - test('can create a new credential stores', async function (assert) { assert.expect(1); const count = getCredentialStoresCount(); @@ -132,160 +109,4 @@ module('Acceptance | credential-stores', function (hooks) { 'Name is required.' ); }); - - test('can save changes to existing credential store', async function (assert) { - assert.expect(3); - assert.notEqual(instances.credentialStore.name, 'random string'); - await visit(urls.credentialStore); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('.rose-form-actions [type="submit"]'); - assert.equal(currentURL(), urls.credentialStore); - assert.equal( - this.server.schema.credentialStores.all().models[0].name, - 'random string' - ); - }); - - test('can cancel changes to existing credential store', async function (assert) { - assert.expect(2); - await visit(urls.credentialStore); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('.rose-form-actions [type="button"]'); - assert.notEqual(instances.credentialStore.name, 'random string'); - assert.equal(find('[name="name"]').value, instances.credentialStore.name); - }); - - test('saving an existing credential store with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/credential-stores/:id', () => { - return new Response( - 400, - {}, - { - status: 400, - code: 'invalid_argument', - message: 'The request was invalid.', - details: { - request_fields: [ - { - name: 'name', - description: 'Name is required.', - }, - ], - }, - } - ); - }); - await visit(urls.credentialStore); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('[type="submit"]'); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'The request was invalid.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.' - ); - }); - - test('can discard unsaved credential store changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.credentialStore.name, 'random string'); - - await visit(urls.credentialStore); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.credentialStore); - - try { - await visit(urls.credentialStores); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:first-child', 'Click Discard'); - assert.equal(currentURL(), urls.credentialStores); - assert.notEqual( - this.server.schema.credentialStores.all().models[0].name, - 'random string' - ); - } - }); - - test('can cancel discard unsaved credential store via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.credentialStore.name, 'random string'); - await visit(urls.credentialStore); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.credentialStore); - - try { - await visit(urls.credentialStores); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:last-child'); - assert.equal(currentURL(), urls.credentialStore); - assert.notEqual( - this.server.schema.credentialStores.all().models[0].name, - 'random string' - ); - } - }); - - test('can delete credential store', async function (assert) { - assert.expect(1); - const count = getCredentialStoresCount(); - await visit(urls.credentialStore); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getCredentialStoresCount(), count - 1); - }); - - test('can accept delete credential store via dialog', async function (assert) { - assert.expect(2); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - confirmService.confirm = sinon.fake.returns(resolve()); - const count = getCredentialStoresCount(); - await visit(urls.credentialStore); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getCredentialStoresCount(), count - 1); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('cannot cancel delete credential store via dialog', async function (assert) { - assert.expect(2); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - confirmService.confirm = sinon.fake.returns(reject()); - const count = getCredentialStoresCount(); - await visit(urls.credentialStore); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getCredentialStoresCount(), count); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('deleting a credential store which errors displays error messages', async function (assert) { - assert.expect(1); - this.server.del('/credential-stores/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.credentialStore); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.'); - }); });