From b69f964b4333c5f7ba27eaafdaa810a6c39f6cd8 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 12 Aug 2021 10:35:33 -0700 Subject: [PATCH 01/36] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20role=20capabilitie?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/factories/role.js | 8 ++ ui/admin/app/components/form/role/index.hbs | 16 +-- .../templates/scopes/scope/roles/index.hbs | 8 +- .../scopes/scope/roles/role/-actions.hbs | 18 +-- ui/admin/tests/acceptance/roles-test.js | 45 ------- .../tests/acceptance/roles/delete-test.js | 97 +++++++++++++++ ui/admin/tests/acceptance/roles/read-test.js | 80 +++++++++++++ .../tests/acceptance/roles/update-test.js | 113 ++++++++++++++++++ 8 files changed, 322 insertions(+), 63 deletions(-) create mode 100644 ui/admin/tests/acceptance/roles/delete-test.js create mode 100644 ui/admin/tests/acceptance/roles/read-test.js create mode 100644 ui/admin/tests/acceptance/roles/update-test.js diff --git a/addons/api/mirage/factories/role.js b/addons/api/mirage/factories/role.js index 103a3725b..d04b8598b 100644 --- a/addons/api/mirage/factories/role.js +++ b/addons/api/mirage/factories/role.js @@ -1,7 +1,15 @@ import factory from '../generated/factories/role'; import { trait } from 'ember-cli-mirage'; +import permissions from '../helpers/permissions'; export default factory.extend({ + authorized_actions: () => + permissions.authorizedActionsFor('account') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], // eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects grant_strings: () => [ 'id=*;action=*', diff --git a/ui/admin/app/components/form/role/index.hbs b/ui/admin/app/components/form/role/index.hbs index 169621362..725cdc0bf 100644 --- a/ui/admin/app/components/form/role/index.hbs +++ b/ui/admin/app/components/form/role/index.hbs @@ -119,12 +119,12 @@ {{/unless}} - - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/index.hbs b/ui/admin/app/templates/scopes/scope/roles/index.hbs index 7fb62530c..d69351c8e 100644 --- a/ui/admin/app/templates/scopes/scope/roles/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs @@ -37,9 +37,13 @@ {{#each @model as |role|}} - + {{#if (can 'read model' role)}} + + {{role.displayName}} + + {{else}} {{role.displayName}} - + {{/if}}

{{role.description}}

 diff --git a/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs b/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs index e330566ad..88add065c 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs @@ -6,12 +6,14 @@ {{t 'resources.role.principal.actions.add-principals'}} - - - {{t 'resources.role.actions.delete'}} - + {{#if (can 'delete model' @model)}} + + + {{t 'resources.role.actions.delete'}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/tests/acceptance/roles-test.js b/ui/admin/tests/acceptance/roles-test.js index 449580a1c..648d6de31 100644 --- a/ui/admin/tests/acceptance/roles-test.js +++ b/ui/admin/tests/acceptance/roles-test.js @@ -56,21 +56,6 @@ module('Acceptance | roles', function (hooks) { urls.newRole = `${urls.roles}/new`; }); - test('visiting roles', async function (assert) { - assert.expect(1); - await visit(urls.roles); - await a11yAudit(); - assert.equal(currentURL(), urls.roles); - }); - - test('can navigate to a role form', async function (assert) { - assert.expect(1); - await visit(urls.roles); - await click('main tbody .rose-table-header-cell:nth-child(1) a'); - await a11yAudit(); - assert.equal(currentURL(), urls.role); - }); - test('can save changes to an existing role', async function (assert) { assert.expect(2); await visit(urls.role); @@ -109,14 +94,6 @@ module('Acceptance | roles', function (hooks) { assert.equal(this.server.db.roles.length, rolesCount); }); - test('can delete a role', async function (assert) { - assert.expect(1); - const rolesCount = this.server.db.roles.length; - await visit(urls.role); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(this.server.db.roles.length, rolesCount - 1); - }); - test('saving a new role with invalid fields displays error messages', async function (assert) { assert.expect(2); this.server.post('/roles', () => { @@ -182,26 +159,4 @@ module('Acceptance | roles', function (hooks) { 'Displays field-level errors.' ); }); - - test('errors are displayed when delete project fails', async function (assert) { - assert.expect(1); - this.server.del('/roles/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.role); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'Oops.', - 'Displays primary error message.' - ); - }); }); diff --git a/ui/admin/tests/acceptance/roles/delete-test.js b/ui/admin/tests/acceptance/roles/delete-test.js new file mode 100644 index 000000000..3018c1858 --- /dev/null +++ b/ui/admin/tests/acceptance/roles/delete-test.js @@ -0,0 +1,97 @@ +import { module, test } from 'qunit'; +import { visit, click, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { Response } from 'miragejs'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | roles', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + role: null, + }; + const urls = { + orgScope: null, + roles: null, + role: null, + newRole: null, + }; + + hooks.beforeEach(function () { + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + // The project scope is not yet used for role tests (though it will be + // in the future). This is created simply to test the grant scope loading + // mechanism. + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: instances.scopes.org.type }, + }); + instances.role = this.server.create( + 'role', + { + scope: instances.scopes.org, + }, + 'withPrincipals' + ); + urls.roles = `/scopes/${instances.scopes.org.id}/roles`; + urls.role = `${urls.roles}/${instances.role.id}`; + urls.newRole = `${urls.roles}/new`; + }); + + test('can delete a role', async function (assert) { + assert.expect(1); + const rolesCount = this.server.db.roles.length; + await visit(urls.role); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(this.server.db.roles.length, rolesCount - 1); + }); + + test('cannot delete a role without proper authorization', async function (assert) { + assert.expect(1); + instances.role.authorized_actions = + instances.role.authorized_actions.filter((item) => item !== 'delete'); + await visit(urls.role); + assert.notOk( + find('.rose-layout-page-actions .rose-dropdown-button-danger') + ); + }); + + test('errors are displayed when delete project fails', async function (assert) { + assert.expect(1); + this.server.del('/roles/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.role); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'Oops.', + 'Displays primary error message.' + ); + }); +}); diff --git a/ui/admin/tests/acceptance/roles/read-test.js b/ui/admin/tests/acceptance/roles/read-test.js new file mode 100644 index 000000000..274956dea --- /dev/null +++ b/ui/admin/tests/acceptance/roles/read-test.js @@ -0,0 +1,80 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, click, 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, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | roles', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + role: null, + }; + const urls = { + orgScope: null, + roles: null, + role: null, + newRole: null, + }; + + hooks.beforeEach(function () { + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + // The project scope is not yet used for role tests (though it will be + // in the future). This is created simply to test the grant scope loading + // mechanism. + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: instances.scopes.org.type }, + }); + instances.role = this.server.create( + 'role', + { + scope: instances.scopes.org, + }, + 'withPrincipals' + ); + urls.roles = `/scopes/${instances.scopes.org.id}/roles`; + urls.role = `${urls.roles}/${instances.role.id}`; + urls.newRole = `${urls.roles}/new`; + }); + + test('visiting roles', async function (assert) { + assert.expect(1); + await visit(urls.roles); + await a11yAudit(); + assert.equal(currentURL(), urls.roles); + }); + + test('can navigate to a role form', async function (assert) { + assert.expect(1); + await visit(urls.roles); + await click('main tbody .rose-table-header-cell:nth-child(1) a'); + await a11yAudit(); + assert.equal(currentURL(), urls.role); + }); + + test('cannot navigate to a role form without proper authorization', async function (assert) { + assert.expect(1); + instances.role.authorized_actions = + instances.role.authorized_actions.filter((item) => item !== 'read'); + await visit(urls.roles); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); +}); diff --git a/ui/admin/tests/acceptance/roles/update-test.js b/ui/admin/tests/acceptance/roles/update-test.js new file mode 100644 index 000000000..b61402421 --- /dev/null +++ b/ui/admin/tests/acceptance/roles/update-test.js @@ -0,0 +1,113 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, click, fillIn, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { Response } from 'miragejs'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | roles', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + role: null, + }; + const urls = { + orgScope: null, + roles: null, + role: null, + newRole: null, + }; + + hooks.beforeEach(function () { + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + // The project scope is not yet used for role tests (though it will be + // in the future). This is created simply to test the grant scope loading + // mechanism. + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: instances.scopes.org.type }, + }); + instances.role = this.server.create( + 'role', + { + scope: instances.scopes.org, + }, + 'withPrincipals' + ); + urls.roles = `/scopes/${instances.scopes.org.id}/roles`; + urls.role = `${urls.roles}/${instances.role.id}`; + urls.newRole = `${urls.roles}/new`; + }); + + test('can save changes to an existing role', async function (assert) { + assert.expect(2); + await visit(urls.role); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'Updated admin role'); + await click('.rose-form-actions [type="submit"]'); + assert.equal(currentURL(), urls.role); + assert.equal(this.server.db.roles[0].name, 'Updated admin role'); + }); + + test('can cancel changes to an existing role', async function (assert) { + assert.expect(1); + await visit(urls.role); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'Updated admin role'); + await click('.rose-form-actions [type="button"]'); + assert.notEqual(find('[name="name"]').value, 'Updated admin role'); + }); + + test('saving an existing role with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/roles/: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.role); + 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.', + 'Displays primary error message.' + ); + assert.ok( + find('.rose-form-error-message').textContent.trim(), + 'Name is required.', + 'Displays field-level errors.' + ); + }); +}); From 28e2b67aa8e167dc1fa226ceb841d53f7baff1d2 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 12 Aug 2021 11:04:47 -0700 Subject: [PATCH 02/36] =?UTF-8?q?fix:=20=F0=9F=90=9B=20remove=20redudant?= =?UTF-8?q?=20test=20cases?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/tests/acceptance/roles-test.js | 56 ------------------------- 1 file changed, 56 deletions(-) diff --git a/ui/admin/tests/acceptance/roles-test.js b/ui/admin/tests/acceptance/roles-test.js index 648d6de31..77b971f46 100644 --- a/ui/admin/tests/acceptance/roles-test.js +++ b/ui/admin/tests/acceptance/roles-test.js @@ -56,25 +56,6 @@ module('Acceptance | roles', function (hooks) { urls.newRole = `${urls.roles}/new`; }); - test('can save changes to an existing role', async function (assert) { - assert.expect(2); - await visit(urls.role); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'Updated admin role'); - await click('.rose-form-actions [type="submit"]'); - assert.equal(currentURL(), urls.role); - assert.equal(this.server.db.roles[0].name, 'Updated admin role'); - }); - - test('can cancel changes to an existing role', async function (assert) { - assert.expect(1); - await visit(urls.role); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'Updated admin role'); - await click('.rose-form-actions [type="button"]'); - assert.notEqual(find('[name="name"]').value, 'Updated admin role'); - }); - test('can create new role', async function (assert) { assert.expect(1); const rolesCount = this.server.db.roles.length; @@ -122,41 +103,4 @@ module('Acceptance | roles', function (hooks) { assert.ok(find('[role="alert"]')); assert.ok(find('.rose-form-error-message')); }); - - test('saving an existing role with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/roles/: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.role); - 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.', - 'Displays primary error message.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.', - 'Displays field-level errors.' - ); - }); }); From 16c03a088baddf0d23d535204b764ccef5b8456a Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 12 Aug 2021 11:19:33 -0700 Subject: [PATCH 03/36] =?UTF-8?q?fix:=20=F0=9F=90=9B=20sync=20up=20yarn=20?= =?UTF-8?q?lock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yarn.lock | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/yarn.lock b/yarn.lock index e32eb765e..796961516 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7682,7 +7682,7 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -12399,7 +12399,7 @@ import-lazy@^4.0.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -14091,11 +14091,6 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -14104,16 +14099,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*, lodash._bindcallback@^3.0.0: +lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -14123,19 +14113,12 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: +lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= @@ -14353,7 +14336,7 @@ lodash.pick@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= -lodash.restparam@*, lodash.restparam@^3.0.0: +lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= From 7cde048ac1a604d9cb96024d00c49c71615c02fe Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 12 Aug 2021 11:48:21 -0700 Subject: [PATCH 04/36] =?UTF-8?q?fix:=20=F0=9F=90=9B=20name=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/factories/role.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/api/mirage/factories/role.js b/addons/api/mirage/factories/role.js index d04b8598b..a057fc29f 100644 --- a/addons/api/mirage/factories/role.js +++ b/addons/api/mirage/factories/role.js @@ -4,7 +4,7 @@ import permissions from '../helpers/permissions'; export default factory.extend({ authorized_actions: () => - permissions.authorizedActionsFor('account') || [ + permissions.authorizedActionsFor('role') || [ 'no-op', 'read', 'update', From 47d4366397971983e1be9ffe694c3a250bfd475c Mon Sep 17 00:00:00 2001 From: dharini Date: Mon, 16 Aug 2021 13:31:28 -0700 Subject: [PATCH 05/36] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20auth=20capabilitie?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit auth capabilities --- addons/api/mirage/factories/auth-method.js | 8 + .../form/auth-method/oidc/index.hbs | 16 +- .../form/auth-method/password/index.hbs | 15 +- .../auth-methods/auth-method/-actions.hbs | 18 +- .../scopes/scope/auth-methods/index.hbs | 20 ++- .../tests/acceptance/auth-methods-test.js | 169 ------------------ .../acceptance/auth-methods/delete-test.js | 93 ++++++++++ .../acceptance/auth-methods/read-test.js | 72 ++++++++ .../acceptance/auth-methods/update-test.js | 154 ++++++++++++++++ yarn.lock | 27 +-- 10 files changed, 371 insertions(+), 221 deletions(-) create mode 100644 ui/admin/tests/acceptance/auth-methods/delete-test.js create mode 100644 ui/admin/tests/acceptance/auth-methods/read-test.js create mode 100644 ui/admin/tests/acceptance/auth-methods/update-test.js diff --git a/addons/api/mirage/factories/auth-method.js b/addons/api/mirage/factories/auth-method.js index fd8e705fd..6a7fb1346 100644 --- a/addons/api/mirage/factories/auth-method.js +++ b/addons/api/mirage/factories/auth-method.js @@ -1,9 +1,17 @@ import factory from '../generated/factories/auth-method'; import { trait } from 'ember-cli-mirage'; +import permissions from '../helpers/permissions'; const types = ['password', 'oidc']; export default factory.extend({ + authorized_actions: () => + permissions.authorizedActionsFor('auth') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], id: (i) => `auth-method-id-${i}`, // Cycle through available types diff --git a/ui/admin/app/components/form/auth-method/oidc/index.hbs b/ui/admin/app/components/form/auth-method/oidc/index.hbs index 7d43d2e67..08c5e87de 100644 --- a/ui/admin/app/components/form/auth-method/oidc/index.hbs +++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs @@ -6,7 +6,6 @@ @showEditToggle={{if @model.isNew false true}} as |form| > - {{/unless}} - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/components/form/auth-method/password/index.hbs b/ui/admin/app/components/form/auth-method/password/index.hbs index 57cbc1af0..d7005538f 100644 --- a/ui/admin/app/components/form/auth-method/password/index.hbs +++ b/ui/admin/app/components/form/auth-method/password/index.hbs @@ -51,11 +51,12 @@ {{/if}} - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs index 2d6e7d9a9..cef459d7f 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs @@ -59,12 +59,14 @@ > {{t 'resources.account.actions.create'}} - - - {{t 'resources.auth-method.actions.delete'}} - + {{#if (can 'delete model' @model)}} + + + {{t 'resources.auth-method.actions.delete'}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs index 6d4460c1e..4bd1bd2a4 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -76,6 +76,19 @@ }} {{#if authMethod.isOIDC}} {{#if (feature-flag 'oidc-crud')}} + {{#if (can 'read model' authMethod)}} + + {{authMethod.displayName}} + + {{else}} + {{authMethod.displayName}} + {{/if}} + {{/if}} + {{else}} + {{#if (can 'read model' authMethod)}} - {{authMethod.displayName}} - {{/if}}

{{authMethod.description}}

diff --git a/ui/admin/tests/acceptance/auth-methods-test.js b/ui/admin/tests/acceptance/auth-methods-test.js index 5c46e1353..61d8071a3 100644 --- a/ui/admin/tests/acceptance/auth-methods-test.js +++ b/ui/admin/tests/acceptance/auth-methods-test.js @@ -103,175 +103,6 @@ module('Acceptance | auth methods', function (hooks) { assert.equal(currentURL(), urls.authMethods); }); - test('can delete an auth method', async function (assert) { - assert.expect(1); - const authMethodsCount = this.server.db.authMethods.length; - await visit(urls.authMethod); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(this.server.db.authMethods.length, authMethodsCount - 1); - }); - - test('saving a new auth method with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.post('/auth-methods', () => { - 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.newAuthMethod); - await fillIn('[name="name"]', 'new auth method'); - await click('form [type="submit"]'); - await a11yAudit(); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'The request was invalid.', - 'Displays primary error message.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.', - 'Displays field-level errors.' - ); - }); - - test('errors are displayed when save on auth method fails', async function (assert) { - assert.expect(1); - this.server.patch('/auth-methods/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.authMethod); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'save auth method'); - await click('form [type="submit"]'); - await a11yAudit(); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'Oops.', - 'Displays primary error message.' - ); - }); - - test('errors are displayed when delete on an auth method fails', async function (assert) { - assert.expect(1); - this.server.del('/auth-methods/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.authMethod); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - await a11yAudit(); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'Oops.', - 'Displays primary error message.' - ); - }); - - test('saving an existing auth method with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/auth-methods/: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.authMethod); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'existing auth method'); - await click('form [type="submit"]'); - await a11yAudit(); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'The request was invalid.', - 'Displays primary error message.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.', - 'Displays field-level errors.' - ); - }); - - test('saving an existing auth method with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/auth-methods/: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.authMethod); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'existing auth method'); - await click('form [type="submit"]'); - await a11yAudit(); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'The request was invalid.', - 'Displays primary error message.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.', - 'Displays field-level errors.' - ); - }); - test('user can make primary an auth method', async function (assert) { assert.expect(2); assert.notOk( diff --git a/ui/admin/tests/acceptance/auth-methods/delete-test.js b/ui/admin/tests/acceptance/auth-methods/delete-test.js new file mode 100644 index 000000000..a1b3fc264 --- /dev/null +++ b/ui/admin/tests/acceptance/auth-methods/delete-test.js @@ -0,0 +1,93 @@ +import { module, test } from 'qunit'; +import { visit, click, 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 { Response } from 'miragejs'; +import { + authenticateSession, + // // These are left here intentionally for future reference. + // //currentSession, + // //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | auth methods', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + }, + authMethod: null, + }; + const urls = { + orgScope: null, + authMethods: null, + newAuthMethod: null, + authMethod: null, + }; + + hooks.beforeEach(function () { + // Setup Mirage mock resources for this test + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.authMethod = this.server.create('auth-method', { + scope: instances.scopes.org, + }); + + // Generate route URLs for resources + urls.orgScope = `/scopes/${instances.scopes.org.id}`; + urls.authMethods = `${urls.orgScope}/auth-methods`; + urls.newAuthMethod = `${urls.authMethods}/new?type=password`; + urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`; + }); + + test('can delete an auth method', async function (assert) { + assert.expect(1); + const authMethodsCount = this.server.db.authMethods.length; + await visit(urls.authMethod); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(this.server.db.authMethods.length, authMethodsCount - 1); + }); + + test('errors are displayed when delete on an auth method fails', async function (assert) { + assert.expect(1); + this.server.del('/auth-methods/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.authMethod); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + await a11yAudit(); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'Oops.', + 'Displays primary error message.' + ); + }); + + test('cannot delete an auth method without proper authorization', async function (assert) { + assert.expect(1); + instances.authMethod.authorized_actions = + instances.authMethod.authorized_actions.filter( + (item) => item !== 'delete' + ); + await visit(urls.authMethod); + assert.notOk( + find('.rose-layout-page-actions .rose-dropdown-button-danger') + ); + }); +}); diff --git a/ui/admin/tests/acceptance/auth-methods/read-test.js b/ui/admin/tests/acceptance/auth-methods/read-test.js new file mode 100644 index 000000000..9cb08efd0 --- /dev/null +++ b/ui/admin/tests/acceptance/auth-methods/read-test.js @@ -0,0 +1,72 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, click, 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, + // // These are left here intentionally for future reference. + // //currentSession, + // //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | auth methods', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + }, + authMethod: null, + }; + const urls = { + orgScope: null, + authMethods: null, + newAuthMethod: null, + authMethod: null, + }; + + hooks.beforeEach(function () { + // Setup Mirage mock resources for this test + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.authMethod = this.server.create('auth-method', { + scope: instances.scopes.org, + }); + + // Generate route URLs for resources + urls.orgScope = `/scopes/${instances.scopes.org.id}`; + urls.authMethods = `${urls.orgScope}/auth-methods`; + urls.newAuthMethod = `${urls.authMethods}/new?type=password`; + urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`; + }); + + test('visiting auth methods', async function (assert) { + assert.expect(1); + await visit(urls.authMethods); + await a11yAudit(); + assert.equal(currentURL(), urls.authMethods); + }); + + test('can navigate to an auth method form', async function (assert) { + assert.expect(1); + await visit(urls.authMethods); + await click('main tbody .rose-table-header-cell:nth-child(1) a'); + await a11yAudit(); + assert.equal(currentURL(), urls.authMethod); + }); + + test('cannot navigate to an auth method form without proper authorization', async function (assert) { + assert.expect(1); + instances.authMethod.authorized_actions = + instances.authMethod.authorized_actions.filter((item) => item !== 'read'); + await visit(urls.authMethod); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); +}); diff --git a/ui/admin/tests/acceptance/auth-methods/update-test.js b/ui/admin/tests/acceptance/auth-methods/update-test.js new file mode 100644 index 000000000..45efac293 --- /dev/null +++ b/ui/admin/tests/acceptance/auth-methods/update-test.js @@ -0,0 +1,154 @@ +import { module, test } from 'qunit'; +import { visit, click, find, 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 { Response } from 'miragejs'; +import { + authenticateSession, + // // These are left here intentionally for future reference. + // //currentSession, + // //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | auth methods', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + }, + authMethod: null, + }; + const urls = { + orgScope: null, + authMethods: null, + newAuthMethod: null, + authMethod: null, + }; + + hooks.beforeEach(function () { + // Setup Mirage mock resources for this test + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.authMethod = this.server.create('auth-method', { + scope: instances.scopes.org, + }); + + // Generate route URLs for resources + urls.orgScope = `/scopes/${instances.scopes.org.id}`; + urls.authMethods = `${urls.orgScope}/auth-methods`; + urls.newAuthMethod = `${urls.authMethods}/new?type=password`; + urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`; + }); + + test('can update an auth method and save changes', async function (assert) { + assert.expect(1); + await visit(urls.authMethod); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'update name'); + await click('form [type="submit"]:not(:disabled)'); + assert.equal(this.server.db.authMethods[0].name, 'update name'); + }); + + test('can update an auth method and cancel changes', async function (assert) { + assert.expect(1); + await visit(urls.authMethod); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'update name'); + await click('form button:not([type="submit"])'); + assert.notEqual(this.server.db.authMethods[0].name, 'update name'); + }); + + test('cannot make changes to an existing auth method without proper authorization', async function (assert) { + assert.expect(1); + instances.authMethod.authorized_actions = + instances.authMethod.authorized_actions.filter( + (item) => item !== 'update' + ); + await visit(urls.authMethod); + assert.notOk(find('.rose-layout-page-actions .rose-button-secondary')); + }); + + test('saving an existing auth method with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/auth-methods/: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.authMethod); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'existing auth method'); + await click('form [type="submit"]'); + await a11yAudit(); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'The request was invalid.', + 'Displays primary error message.' + ); + assert.ok( + find('.rose-form-error-message').textContent.trim(), + 'Name is required.', + 'Displays field-level errors.' + ); + }); + + test('saving an existing auth method with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/auth-methods/: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.authMethod); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'existing auth method'); + await click('form [type="submit"]'); + await a11yAudit(); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'The request was invalid.', + 'Displays primary error message.' + ); + assert.ok( + find('.rose-form-error-message').textContent.trim(), + 'Name is required.', + 'Displays field-level errors.' + ); + }); +}); diff --git a/yarn.lock b/yarn.lock index e32eb765e..796961516 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7682,7 +7682,7 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -12399,7 +12399,7 @@ import-lazy@^4.0.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -14091,11 +14091,6 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -14104,16 +14099,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*, lodash._bindcallback@^3.0.0: +lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -14123,19 +14113,12 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: +lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= @@ -14353,7 +14336,7 @@ lodash.pick@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= -lodash.restparam@*, lodash.restparam@^3.0.0: +lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= From d76a4b0055558b0bc20251f2d147c49aa10d225c Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Mon, 16 Aug 2021 14:53:11 -0700 Subject: [PATCH 06/36] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20jszip=20to?= =?UTF-8?q?=20resolutions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add jszip to the resolutions to solve security vulnerability --- ui/desktop/electron-app/package.json | 3 ++- yarn.lock | 27 +++++---------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/ui/desktop/electron-app/package.json b/ui/desktop/electron-app/package.json index 7916fd3de..d06bbd054 100644 --- a/ui/desktop/electron-app/package.json +++ b/ui/desktop/electron-app/package.json @@ -45,6 +45,7 @@ "xmldom": "~0.5.0", "yargs-parser": "~20.2.7", "trim-newlines": "^3.0.1", - "normalize-url": "^4.5.1" + "normalize-url": "^4.5.1", + "jszip": "^3.7.0" } } diff --git a/yarn.lock b/yarn.lock index e32eb765e..796961516 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7682,7 +7682,7 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -12399,7 +12399,7 @@ import-lazy@^4.0.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -14091,11 +14091,6 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -14104,16 +14099,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*, lodash._bindcallback@^3.0.0: +lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -14123,19 +14113,12 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: +lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= @@ -14353,7 +14336,7 @@ lodash.pick@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= -lodash.restparam@*, lodash.restparam@^3.0.0: +lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= From 951f69d4b2869a7bcfa12b201e336832e41a6548 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Mon, 16 Aug 2021 17:04:18 -0700 Subject: [PATCH 07/36] Update delete-test.js --- ui/admin/tests/acceptance/auth-methods/delete-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/auth-methods/delete-test.js b/ui/admin/tests/acceptance/auth-methods/delete-test.js index a1b3fc264..f80721f37 100644 --- a/ui/admin/tests/acceptance/auth-methods/delete-test.js +++ b/ui/admin/tests/acceptance/auth-methods/delete-test.js @@ -11,7 +11,7 @@ import { // //invalidateSession, } from 'ember-simple-auth/test-support'; -module('Acceptance | auth methods', function (hooks) { +module('Acceptance | auth methods | delete', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); From 24c62fbd467720465b95ef19f898984c2200d5c6 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Mon, 16 Aug 2021 17:04:38 -0700 Subject: [PATCH 08/36] Update read-test.js --- ui/admin/tests/acceptance/auth-methods/read-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/auth-methods/read-test.js b/ui/admin/tests/acceptance/auth-methods/read-test.js index 9cb08efd0..93da8e83a 100644 --- a/ui/admin/tests/acceptance/auth-methods/read-test.js +++ b/ui/admin/tests/acceptance/auth-methods/read-test.js @@ -10,7 +10,7 @@ import { // //invalidateSession, } from 'ember-simple-auth/test-support'; -module('Acceptance | auth methods', function (hooks) { +module('Acceptance | auth methods | read', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); From abc9687261a7a2b1db2ef27ab8106754b71a961a Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Mon, 16 Aug 2021 17:04:53 -0700 Subject: [PATCH 09/36] Update update-test.js --- ui/admin/tests/acceptance/auth-methods/update-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/auth-methods/update-test.js b/ui/admin/tests/acceptance/auth-methods/update-test.js index 45efac293..8060e4382 100644 --- a/ui/admin/tests/acceptance/auth-methods/update-test.js +++ b/ui/admin/tests/acceptance/auth-methods/update-test.js @@ -11,7 +11,7 @@ import { // //invalidateSession, } from 'ember-simple-auth/test-support'; -module('Acceptance | auth methods', function (hooks) { +module('Acceptance | auth methods | update', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); From f57619d1fcadd1bd4d963b9397ad601f72c3c57c Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Mon, 16 Aug 2021 17:05:42 -0700 Subject: [PATCH 10/36] Update delete-test.js --- ui/admin/tests/acceptance/roles/delete-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/roles/delete-test.js b/ui/admin/tests/acceptance/roles/delete-test.js index 3018c1858..a965ff63a 100644 --- a/ui/admin/tests/acceptance/roles/delete-test.js +++ b/ui/admin/tests/acceptance/roles/delete-test.js @@ -10,7 +10,7 @@ import { //invalidateSession, } from 'ember-simple-auth/test-support'; -module('Acceptance | roles', function (hooks) { +module('Acceptance | roles | delete', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); From 00b62a6f50011136dac4cedf8ba49a5ec5c2938d Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Mon, 16 Aug 2021 17:05:53 -0700 Subject: [PATCH 11/36] Update read-test.js --- ui/admin/tests/acceptance/roles/read-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/roles/read-test.js b/ui/admin/tests/acceptance/roles/read-test.js index 274956dea..97f717085 100644 --- a/ui/admin/tests/acceptance/roles/read-test.js +++ b/ui/admin/tests/acceptance/roles/read-test.js @@ -10,7 +10,7 @@ import { //invalidateSession, } from 'ember-simple-auth/test-support'; -module('Acceptance | roles', function (hooks) { +module('Acceptance | roles | read', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); From 0ac657e378fad0a9a82f77a458228ba993e4e505 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Mon, 16 Aug 2021 17:06:08 -0700 Subject: [PATCH 12/36] Update update-test.js --- ui/admin/tests/acceptance/roles/update-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/roles/update-test.js b/ui/admin/tests/acceptance/roles/update-test.js index b61402421..625108247 100644 --- a/ui/admin/tests/acceptance/roles/update-test.js +++ b/ui/admin/tests/acceptance/roles/update-test.js @@ -10,7 +10,7 @@ import { //invalidateSession, } from 'ember-simple-auth/test-support'; -module('Acceptance | roles', function (hooks) { +module('Acceptance | roles | update', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); From da04a190e697cb2e161faa3a705f6ed35ea68bc1 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 17 Aug 2021 08:42:50 -0700 Subject: [PATCH 13/36] =?UTF-8?q?fix:=20=F0=9F=90=9B=20add=20missing=20tes?= =?UTF-8?q?t=20and=20remove=20jsconfig=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/jsconfig.json | 1 - ui/admin/tests/acceptance/roles/update-test.js | 8 ++++++++ ui/desktop/jsconfig.json | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 ui/admin/jsconfig.json delete mode 100644 ui/desktop/jsconfig.json diff --git a/ui/admin/jsconfig.json b/ui/admin/jsconfig.json deleted file mode 100644 index f408cac8c..000000000 --- a/ui/admin/jsconfig.json +++ /dev/null @@ -1 +0,0 @@ -{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]} \ No newline at end of file diff --git a/ui/admin/tests/acceptance/roles/update-test.js b/ui/admin/tests/acceptance/roles/update-test.js index 625108247..21737c705 100644 --- a/ui/admin/tests/acceptance/roles/update-test.js +++ b/ui/admin/tests/acceptance/roles/update-test.js @@ -65,6 +65,14 @@ module('Acceptance | roles | update', function (hooks) { assert.equal(this.server.db.roles[0].name, 'Updated admin role'); }); + test('cannot make changes to an existing role without proper authorization', async function (assert) { + assert.expect(1); + instances.role.authorized_actions = + instances.role.authorized_actions.filter((item) => item !== 'update'); + await visit(urls.role); + assert.notOk(find('.rose-layout-page-actions .rose-button-secondary')); + }); + test('can cancel changes to an existing role', async function (assert) { assert.expect(1); await visit(urls.role); diff --git a/ui/desktop/jsconfig.json b/ui/desktop/jsconfig.json deleted file mode 100644 index f408cac8c..000000000 --- a/ui/desktop/jsconfig.json +++ /dev/null @@ -1 +0,0 @@ -{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]} \ No newline at end of file From 15522f31af066179c435740014fbfc1688dcb1a7 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 17 Aug 2021 08:47:16 -0700 Subject: [PATCH 14/36] Update auth-method.js --- addons/api/mirage/factories/auth-method.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/api/mirage/factories/auth-method.js b/addons/api/mirage/factories/auth-method.js index 6a7fb1346..9e14a9e99 100644 --- a/addons/api/mirage/factories/auth-method.js +++ b/addons/api/mirage/factories/auth-method.js @@ -6,7 +6,7 @@ const types = ['password', 'oidc']; export default factory.extend({ authorized_actions: () => - permissions.authorizedActionsFor('auth') || [ + permissions.authorizedActionsFor('auth-method') || [ 'no-op', 'read', 'update', From 42bc4c17773d30cce60b40744ef22e070ddc6884 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 17 Aug 2021 11:06:57 -0700 Subject: [PATCH 15/36] =?UTF-8?q?fix:=20=F0=9F=90=9B=20enclose=20delete=20?= =?UTF-8?q?user=20with=20if=20block?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 4f993d425..280fd98bb 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 @@ -{{#if (can 'delete model' @model)}} - - - {{t 'resources.user.actions.add-accounts'}} - + + + {{t 'resources.user.actions.add-accounts'}} + + {{#if (can 'delete model' @model)}} {{t 'resources.user.actions.delete'}} - -{{/if}} \ No newline at end of file + {{/if}} + \ No newline at end of file From ce01358a7eb977b9db938050a3f32d81356e3bde Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Tue, 17 Aug 2021 15:07:28 -0700 Subject: [PATCH 16/36] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20path=20tran?= =?UTF-8?q?sitive=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 17/36] 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 18/36] 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 19/36] 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 20/36] =?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 2d3503736593c53ebe4d97faab8dd3ed377c522c Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 18 Aug 2021 13:03:28 -0700 Subject: [PATCH 21/36] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20hostset=20capabili?= =?UTF-8?q?ty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/factories/host-set.js | 8 + .../app/components/form/host-set/index.hbs | 16 +- .../host-sets/host-set/-actions.hbs | 18 +- .../host-catalog/host-sets/index.hbs | 14 +- .../host-catalogs/host-sets/delete-test.js | 134 ++++++++++++ .../host-catalogs/host-sets/read-test.js | 94 +++++++++ .../host-catalogs/host-sets/update-test.js | 191 ++++++++++++++++++ 7 files changed, 453 insertions(+), 22 deletions(-) create mode 100644 ui/admin/tests/acceptance/host-catalogs/host-sets/delete-test.js create mode 100644 ui/admin/tests/acceptance/host-catalogs/host-sets/read-test.js create mode 100644 ui/admin/tests/acceptance/host-catalogs/host-sets/update-test.js diff --git a/addons/api/mirage/factories/host-set.js b/addons/api/mirage/factories/host-set.js index a3c053fda..def5ff70f 100644 --- a/addons/api/mirage/factories/host-set.js +++ b/addons/api/mirage/factories/host-set.js @@ -1,5 +1,13 @@ import factory from '../generated/factories/host-set'; +import permissions from '../helpers/permissions'; export default factory.extend({ + authorized_actions: () => + permissions.authorizedActionsFor('host-set') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], id: (i) => `host-set-id-${i}`, }); diff --git a/ui/admin/app/components/form/host-set/index.hbs b/ui/admin/app/components/form/host-set/index.hbs index 00de7dca1..01864acc5 100644 --- a/ui/admin/app/components/form/host-set/index.hbs +++ b/ui/admin/app/components/form/host-set/index.hbs @@ -52,12 +52,12 @@ {{/if}} - - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-actions.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-actions.hbs index 1fbc71d74..d78e1b940 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-actions.hbs @@ -13,12 +13,14 @@ > {{t 'resources.host-set.actions.add-hosts'}} - - - {{t 'resources.host-set.actions.delete'}} - + {{#if (can 'delete model' @model)}} + + + {{t 'resources.host-set.actions.delete'}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs index 4f0c433bf..e9f8d15c4 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs @@ -12,12 +12,14 @@ {{#each @model as |hostSet|}} - - {{hostSet.displayName}} - + {{#if (can 'read model' hostSet)}} + + {{hostSet.displayName}} + + {{/if}}

{{hostSet.description}}

 diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/delete-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/delete-test.js new file mode 100644 index 000000000..ed60de6f2 --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/delete-test.js @@ -0,0 +1,134 @@ +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 { Response } from 'miragejs'; +import { resolve, reject } from 'rsvp'; +import sinon from 'sinon'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | host sets | delete', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + let getHostSetCount; + + const instances = { + scopes: { + global: null, + org: null, + project: null, + hostCatalog: null, + host: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + hostSets: null, + hostSet: null, + unknownHostSet: null, + newHostSet: 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.hostCatalog = this.server.create('host-catalog', { + scope: instances.scopes.project, + }); + instances.hostSet = this.server.create('host-set', { + scope: instances.scopes.project, + hostCatalog: instances.hostCatalog, + }); + // 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.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.hostSets = `${urls.hostCatalog}/host-sets`; + urls.hostSet = `${urls.hostSets}/${instances.hostSet.id}`; + urls.unknownHostSet = `${urls.hostSets}/foo`; + urls.newHostSet = `${urls.hostSets}/new`; + // Generate resource couner + getHostSetCount = () => this.server.schema.hostSets.all().models.length; + authenticateSession({}); + }); + + test('can delete host', async function (assert) { + assert.expect(1); + const count = getHostSetCount(); + await visit(urls.hostSet); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getHostSetCount(), count - 1); + }); + + test('can accept delete host set 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 = getHostSetCount(); + await visit(urls.hostSet); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getHostSetCount(), count - 1); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('cannot delete host set without proper authorization', async function (assert) { + assert.expect(1); + instances.hostSet.authorized_actions = + instances.hostSet.authorized_actions.filter((item) => item !== 'delete'); + await visit(urls.hostSet); + assert.notOk( + find('.rose-layout-page-actions .rose-dropdown-button-danger') + ); + }); + + test('cannot cancel delete host set 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 = getHostSetCount(); + await visit(urls.hostSet); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getHostSetCount(), count); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('deleting a host set which errors displays error messages', async function (assert) { + assert.expect(1); + this.server.del('/host-sets/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.hostSet); + 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/host-catalogs/host-sets/read-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/read-test.js new file mode 100644 index 000000000..02526fda5 --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/read-test.js @@ -0,0 +1,94 @@ +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, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | host sets | read', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + hostCatalog: null, + host: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + hostSets: null, + hostSet: null, + unknownHostSet: null, + newHostSet: 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.hostCatalog = this.server.create('host-catalog', { + scope: instances.scopes.project, + }); + instances.hostSet = this.server.create('host-set', { + scope: instances.scopes.project, + hostCatalog: instances.hostCatalog, + }); + // 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.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.hostSets = `${urls.hostCatalog}/host-sets`; + urls.hostSet = `${urls.hostSets}/${instances.hostSet.id}`; + urls.unknownHostSet = `${urls.hostSets}/foo`; + urls.newHostSet = `${urls.hostSets}/new`; + // Generate resource couner + authenticateSession({}); + }); + + test('visiting host sets', async function (assert) { + assert.expect(2); + await visit(urls.hostSets); + await a11yAudit(); + assert.equal(currentURL(), urls.hostSets); + await visit(urls.hostSet); + await a11yAudit(); + assert.equal(currentURL(), urls.hostSet); + }); + + test('cannot navigate to a host set form without proper authorization', async function (assert) { + assert.expect(1); + instances.hostSet.authorized_actions = + instances.hostSet.authorized_actions.filter((item) => item !== 'read'); + await visit(urls.hostSet); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); + + test('visiting an unknown host set displays 404 message', async function (assert) { + assert.expect(1); + await visit(urls.unknownHostSet); + await a11yAudit(); + assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404'); + }); +}); diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/update-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/update-test.js new file mode 100644 index 000000000..46ae48eef --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/update-test.js @@ -0,0 +1,191 @@ +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 { Response } from 'miragejs'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | host sets | update', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + hostCatalog: null, + host: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + hostSets: null, + hostSet: null, + unknownHostSet: null, + newHostSet: 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.hostCatalog = this.server.create('host-catalog', { + scope: instances.scopes.project, + }); + instances.hostSet = this.server.create('host-set', { + scope: instances.scopes.project, + hostCatalog: instances.hostCatalog, + }); + // 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.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.hostSets = `${urls.hostCatalog}/host-sets`; + urls.hostSet = `${urls.hostSets}/${instances.hostSet.id}`; + urls.unknownHostSet = `${urls.hostSets}/foo`; + urls.newHostSet = `${urls.hostSets}/new`; + // Generate resource couner + authenticateSession({}); + }); + + test('saving a new host set with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.post('/host-sets', () => { + 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.newHostSet); + 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 save changes to existing host', async function (assert) { + assert.expect(3); + assert.notEqual(instances.hostSet.name, 'random string'); + await visit(urls.hostSet); + 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.hostSet); + assert.equal( + this.server.schema.hostSets.all().models[0].name, + 'random string' + ); + }); + + test('cannot make changes to an existing host without proper authorization', async function (assert) { + assert.expect(1); + instances.hostSet.authorized_actions = + instances.hostSet.authorized_actions.filter((item) => item !== 'update'); + await visit(urls.hostSet); + assert.notOk(find('.rose-layout-page-actions .rose-button-secondary')); + }); + + test('can cancel changes to existing host', async function (assert) { + assert.expect(2); + await visit(urls.hostSet); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('.rose-form-actions [type="button"]'); + assert.notEqual(instances.hostSet.name, 'random string'); + assert.equal(find('[name="name"]').value, instances.hostSet.name); + }); + + test('saving an existing host set with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/host-sets/: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.hostSet); + 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 host set changes via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.hostSet.name, 'random string'); + await visit(urls.hostSet); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.hostSet); + try { + await visit(urls.hostSets); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:first-child'); + assert.equal(currentURL(), urls.hostSets); + assert.notEqual( + this.server.schema.hostSets.all().models[0].name, + 'random string' + ); + } + }); +}); From 4b039c9f590e43b59e86f17e051d69fb628b4181 Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 18 Aug 2021 15:56:25 -0700 Subject: [PATCH 22/36] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20host=20capability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/factories/host.js | 8 + ui/admin/app/components/form/host/index.hbs | 16 +- .../host-catalog/hosts/host/-actions.hbs | 26 +-- .../host-catalog/hosts/index.hbs | 14 +- .../acceptance/host-catalogs/hosts-test.js | 173 ----------------- .../host-catalogs/hosts/delete-test.js | 134 +++++++++++++ .../host-catalogs/hosts/read-test.js | 94 +++++++++ .../host-catalogs/hosts/update-test.js | 180 ++++++++++++++++++ 8 files changed, 446 insertions(+), 199 deletions(-) create mode 100644 ui/admin/tests/acceptance/host-catalogs/hosts/delete-test.js create mode 100644 ui/admin/tests/acceptance/host-catalogs/hosts/read-test.js create mode 100644 ui/admin/tests/acceptance/host-catalogs/hosts/update-test.js diff --git a/addons/api/mirage/factories/host.js b/addons/api/mirage/factories/host.js index c797e8a64..895b44468 100644 --- a/addons/api/mirage/factories/host.js +++ b/addons/api/mirage/factories/host.js @@ -1,5 +1,13 @@ import factory from '../generated/factories/host'; +import permissions from '../helpers/permissions'; export default factory.extend({ + authorized_actions: () => + permissions.authorizedActionsFor('host') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], id: (i) => `host-id-${i}`, }); diff --git a/ui/admin/app/components/form/host/index.hbs b/ui/admin/app/components/form/host/index.hbs index 78d0b0a73..9b39cdb26 100644 --- a/ui/admin/app/components/form/host/index.hbs +++ b/ui/admin/app/components/form/host/index.hbs @@ -71,12 +71,12 @@ {{/if}} - - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-actions.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-actions.hbs index 5529db8d5..18bcaeb55 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-actions.hbs @@ -1,13 +1,15 @@ - - - {{t 'resources.host.actions.delete'}} - - \ No newline at end of file + + {{t 'resources.host.actions.delete'}} + + +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs index c7079adec..5a31d35cb 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs @@ -13,12 +13,14 @@ {{#each @model as |host|}} - - {{host.displayName}} - + {{#if (can 'read model' host)}} + + {{host.displayName}} + + {{/if}}

{{host.description}}

 diff --git a/ui/admin/tests/acceptance/host-catalogs/hosts-test.js b/ui/admin/tests/acceptance/host-catalogs/hosts-test.js index b8c5520e6..a4ab70a60 100644 --- a/ui/admin/tests/acceptance/host-catalogs/hosts-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/hosts-test.js @@ -2,10 +2,7 @@ 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 { Response } from 'miragejs'; -import { resolve, reject } from 'rsvp'; -import sinon from 'sinon'; import { authenticateSession, // These are left here intentionally for future reference. @@ -73,23 +70,6 @@ module('Acceptance | host-catalogs | hosts', function (hooks) { authenticateSession({}); }); - test('visiting hosts', async function (assert) { - assert.expect(2); - await visit(urls.hosts); - await a11yAudit(); - assert.equal(currentURL(), urls.hosts); - await visit(urls.host); - await a11yAudit(); - assert.equal(currentURL(), urls.host); - }); - - test('visiting an unknown host displays 404 message', async function (assert) { - assert.expect(1); - await visit(urls.unknownHost); - await a11yAudit(); - assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404'); - }); - test('can create new host', async function (assert) { assert.expect(1); const count = getHostCount(); @@ -141,157 +121,4 @@ module('Acceptance | host-catalogs | hosts', function (hooks) { 'Name is required.' ); }); - - test('can save changes to existing host', async function (assert) { - assert.expect(3); - assert.notEqual(instances.host.name, 'random string'); - await visit(urls.host); - 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.host); - assert.equal( - this.server.schema.hosts.all().models[0].name, - 'random string' - ); - }); - - test('can cancel changes to existing host', async function (assert) { - assert.expect(2); - await visit(urls.host); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('.rose-form-actions [type="button"]'); - assert.notEqual(instances.host.name, 'random string'); - assert.equal(find('[name="name"]').value, instances.host.name); - }); - - test('saving an existing host with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/hosts/: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.host); - 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 host changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.host.name, 'random string'); - await visit(urls.host); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.host); - try { - await visit(urls.hosts); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:first-child'); - assert.equal(currentURL(), urls.hosts); - assert.notEqual( - this.server.schema.hosts.all().models[0].name, - 'random string' - ); - } - }); - - test('can cancel discard unsaved host changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.host.name, 'random string'); - await visit(urls.host); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.host); - try { - await visit(urls.hosts); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:last-child'); - assert.equal(currentURL(), urls.host); - assert.notEqual( - this.server.schema.hosts.all().models[0].name, - 'random string' - ); - } - }); - - test('can delete host', async function (assert) { - assert.expect(1); - const count = getHostCount(); - await visit(urls.host); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getHostCount(), count - 1); - }); - - test('can accept delete host 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 = getHostCount(); - await visit(urls.host); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getHostCount(), count - 1); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('cannot cancel delete host 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 = getHostCount(); - await visit(urls.host); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getHostCount(), count); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('deleting a host which errors displays error messages', async function (assert) { - assert.expect(1); - this.server.del('/hosts/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.host); - 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/host-catalogs/hosts/delete-test.js b/ui/admin/tests/acceptance/host-catalogs/hosts/delete-test.js new file mode 100644 index 000000000..9563d1e0c --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/hosts/delete-test.js @@ -0,0 +1,134 @@ +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 { Response } from 'miragejs'; +import { resolve, reject } from 'rsvp'; +import sinon from 'sinon'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | hosts | delete', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + let getHostCount; + + const instances = { + scopes: { + global: null, + org: null, + project: null, + hostCatalog: null, + host: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + hosts: null, + host: null, + unknownHost: null, + newHost: 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.hostCatalog = this.server.create('host-catalog', { + scope: instances.scopes.project, + }); + instances.host = this.server.create('host', { + scope: instances.scopes.project, + hostCatalog: instances.hostCatalog, + }); + // 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.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.hosts = `${urls.hostCatalog}/hosts`; + urls.host = `${urls.hosts}/${instances.host.id}`; + urls.unknownHost = `${urls.hosts}/foo`; + urls.newHost = `${urls.hosts}/new`; + // Generate resource couner + getHostCount = () => this.server.schema.hosts.all().models.length; + authenticateSession({}); + }); + + test('can delete host', async function (assert) { + assert.expect(1); + const count = getHostCount(); + await visit(urls.host); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getHostCount(), count - 1); + }); + + test('cannot delete a host without proper authorization', async function (assert) { + assert.expect(1); + instances.host.authorized_actions = + instances.host.authorized_actions.filter((item) => item !== 'delete'); + await visit(urls.host); + assert.notOk( + find('.rose-layout-page-actions .rose-dropdown-button-danger') + ); + }); + + test('can accept delete host 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 = getHostCount(); + await visit(urls.host); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getHostCount(), count - 1); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('cannot cancel delete host 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 = getHostCount(); + await visit(urls.host); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getHostCount(), count); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('deleting a host which errors displays error messages', async function (assert) { + assert.expect(1); + this.server.del('/hosts/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.host); + 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/host-catalogs/hosts/read-test.js b/ui/admin/tests/acceptance/host-catalogs/hosts/read-test.js new file mode 100644 index 000000000..420dfc552 --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/hosts/read-test.js @@ -0,0 +1,94 @@ +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, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | hosts | read', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + hostCatalog: null, + host: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + hosts: null, + host: null, + unknownHost: null, + newHost: 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.hostCatalog = this.server.create('host-catalog', { + scope: instances.scopes.project, + }); + instances.host = this.server.create('host', { + scope: instances.scopes.project, + hostCatalog: instances.hostCatalog, + }); + // 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.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.hosts = `${urls.hostCatalog}/hosts`; + urls.host = `${urls.hosts}/${instances.host.id}`; + urls.unknownHost = `${urls.hosts}/foo`; + urls.newHost = `${urls.hosts}/new`; + // Generate resource couner + authenticateSession({}); + }); + + test('visiting hosts', async function (assert) { + assert.expect(2); + await visit(urls.hosts); + await a11yAudit(); + assert.equal(currentURL(), urls.hosts); + await visit(urls.host); + await a11yAudit(); + assert.equal(currentURL(), urls.host); + }); + + test('cannot navigate to a role form without proper authorization', async function (assert) { + assert.expect(1); + instances.host.authorized_actions = + instances.host.authorized_actions.filter((item) => item !== 'read'); + await visit(urls.hosts); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); + + test('visiting an unknown host displays 404 message', async function (assert) { + assert.expect(1); + await visit(urls.unknownHost); + await a11yAudit(); + assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404'); + }); +}); diff --git a/ui/admin/tests/acceptance/host-catalogs/hosts/update-test.js b/ui/admin/tests/acceptance/host-catalogs/hosts/update-test.js new file mode 100644 index 000000000..76eb3d995 --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/hosts/update-test.js @@ -0,0 +1,180 @@ +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 { Response } from 'miragejs'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | hosts | update', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + hostCatalog: null, + host: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + hosts: null, + host: null, + unknownHost: null, + newHost: 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.hostCatalog = this.server.create('host-catalog', { + scope: instances.scopes.project, + }); + instances.host = this.server.create('host', { + scope: instances.scopes.project, + hostCatalog: instances.hostCatalog, + }); + // 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.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.hosts = `${urls.hostCatalog}/hosts`; + urls.host = `${urls.hosts}/${instances.host.id}`; + urls.unknownHost = `${urls.hosts}/foo`; + urls.newHost = `${urls.hosts}/new`; + // Generate resource couner + authenticateSession({}); + }); + + test('can save changes to existing host', async function (assert) { + assert.expect(3); + assert.notEqual(instances.host.name, 'random string'); + await visit(urls.host); + 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.host); + assert.equal( + this.server.schema.hosts.all().models[0].name, + 'random string' + ); + }); + + test('cannot make changes to an existing host without proper authorization', async function (assert) { + assert.expect(1); + instances.host.authorized_actions = + instances.host.authorized_actions.filter((item) => item !== 'update'); + await visit(urls.host); + assert.notOk(find('.rose-layout-page-actions .rose-button-secondary')); + }); + + test('can cancel changes to existing host', async function (assert) { + assert.expect(2); + await visit(urls.host); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('.rose-form-actions [type="button"]'); + assert.notEqual(instances.host.name, 'random string'); + assert.equal(find('[name="name"]').value, instances.host.name); + }); + + test('saving an existing host with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/hosts/: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.host); + 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 host changes via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.host.name, 'random string'); + await visit(urls.host); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.host); + try { + await visit(urls.hosts); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:first-child'); + assert.equal(currentURL(), urls.hosts); + assert.notEqual( + this.server.schema.hosts.all().models[0].name, + 'random string' + ); + } + }); + + test('can cancel discard unsaved host changes via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.host.name, 'random string'); + await visit(urls.host); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.host); + try { + await visit(urls.hosts); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:last-child'); + assert.equal(currentURL(), urls.host); + assert.notEqual( + this.server.schema.hosts.all().models[0].name, + 'random string' + ); + } + }); +}); From 884a0ebbc5728c87ea49e25832dfdea62e58e84f Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 19 Aug 2021 14:19:03 -0700 Subject: [PATCH 23/36] =?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 7478aa8f096310467a8a93d39cd4600d2adbe82a Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:25:46 -0400 Subject: [PATCH 24/36] feature(capabilities): add base collection ability class --- addons/api/addon/abilities/collection.js | 36 ++++++++++++++++++ addons/api/app/abilities/collection.js | 1 + .../tests/unit/abilities/collection-test.js | 38 +++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 addons/api/addon/abilities/collection.js create mode 100644 addons/api/app/abilities/collection.js create mode 100644 addons/api/tests/unit/abilities/collection-test.js diff --git a/addons/api/addon/abilities/collection.js b/addons/api/addon/abilities/collection.js new file mode 100644 index 000000000..8cb3ca2d7 --- /dev/null +++ b/addons/api/addon/abilities/collection.js @@ -0,0 +1,36 @@ +import { Ability } from 'ember-can'; + +/** + * Generic ability provides abilities common to all models in the API. + */ +export default class ModelAbility extends Ability { + // =permissions + + /** + * @type {boolean} + */ + get canList() { + return this.hasAuthorizedCollectionAction('list'); + } + + /** + * @type {boolean} + */ + get canCreate() { + return this.hasAuthorizedCollectionAction('create'); + } + + // =methods + + /** + * Returns true if the given action is contained in the ability model's + * `authorized_collection_actions` array. + * @param {string} action + * @return {boolean} + */ + hasAuthorizedCollectionAction(action) { + const { authorized_collection_actions } = this.model; + const collection = this.collection || {}; + return authorized_collection_actions[collection]?.includes(action); + } +} diff --git a/addons/api/app/abilities/collection.js b/addons/api/app/abilities/collection.js new file mode 100644 index 000000000..041825d2d --- /dev/null +++ b/addons/api/app/abilities/collection.js @@ -0,0 +1 @@ +export { default } from 'api/abilities/collection'; diff --git a/addons/api/tests/unit/abilities/collection-test.js b/addons/api/tests/unit/abilities/collection-test.js new file mode 100644 index 000000000..dd9037ee6 --- /dev/null +++ b/addons/api/tests/unit/abilities/collection-test.js @@ -0,0 +1,38 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Abilities | Model', function (hooks) { + setupTest(hooks); + + test('it reflects when a resource may be listed based on authorized_collection_actions', function (assert) { + assert.expect(2); + const service = this.owner.lookup('service:can'); + const model = { + authorized_collection_actions: { + foobars: ['list'], + }, + }; + assert.ok(service.can('list collection', model, { collection: 'foobars' })); + model.authorized_collection_actions = []; + assert.notOk( + service.can('list collection', model, { collection: 'foobars' }) + ); + }); + + test('it reflects when a resource may be created based on authorized_collection_actions', function (assert) { + assert.expect(2); + const service = this.owner.lookup('service:can'); + const model = { + authorized_collection_actions: { + foobars: ['create'], + }, + }; + assert.ok( + service.can('create collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions = []; + assert.notOk( + service.can('create collection', model, { collection: 'foobars' }) + ); + }); +}); From 7fd7613c300281e1aa361f73dd1aebb1f38f0755 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:33:52 -0400 Subject: [PATCH 25/36] test: correct collection test --- addons/api/tests/unit/abilities/collection-test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/api/tests/unit/abilities/collection-test.js b/addons/api/tests/unit/abilities/collection-test.js index dd9037ee6..b810e6939 100644 --- a/addons/api/tests/unit/abilities/collection-test.js +++ b/addons/api/tests/unit/abilities/collection-test.js @@ -1,7 +1,7 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -module('Unit | Abilities | Model', function (hooks) { +module('Unit | Abilities | Collection', function (hooks) { setupTest(hooks); test('it reflects when a resource may be listed based on authorized_collection_actions', function (assert) { @@ -13,7 +13,7 @@ module('Unit | Abilities | Model', function (hooks) { }, }; assert.ok(service.can('list collection', model, { collection: 'foobars' })); - model.authorized_collection_actions = []; + model.authorized_collection_actions.foobars = []; assert.notOk( service.can('list collection', model, { collection: 'foobars' }) ); @@ -30,7 +30,7 @@ module('Unit | Abilities | Model', function (hooks) { assert.ok( service.can('create collection', model, { collection: 'foobars' }) ); - model.authorized_collection_actions = []; + model.authorized_collection_actions.foobars = []; assert.notOk( service.can('create collection', model, { collection: 'foobars' }) ); From f22922ee606114d15d2cc518c38ac8a01f291c31 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 19 Aug 2021 14:42:21 -0700 Subject: [PATCH 26/36] =?UTF-8?q?fix:=20=F0=9F=90=9B=20restructure=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../host-catalogs/host-sets-test.js | 173 ------------------ 1 file changed, 173 deletions(-) diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets-test.js index 779d66689..33465e7ce 100644 --- a/ui/admin/tests/acceptance/host-catalogs/host-sets-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets-test.js @@ -2,10 +2,7 @@ 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 { Response } from 'miragejs'; -import { resolve, reject } from 'rsvp'; -import sinon from 'sinon'; import { authenticateSession, // These are left here intentionally for future reference. @@ -73,23 +70,6 @@ module('Acceptance | host-catalogs | host sets', function (hooks) { authenticateSession({}); }); - test('visiting host sets', async function (assert) { - assert.expect(2); - await visit(urls.hostSets); - await a11yAudit(); - assert.equal(currentURL(), urls.hostSets); - await visit(urls.hostSet); - await a11yAudit(); - assert.equal(currentURL(), urls.hostSet); - }); - - test('visiting an unknown host set displays 404 message', async function (assert) { - assert.expect(1); - await visit(urls.unknownHostSet); - await a11yAudit(); - assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404'); - }); - test('can create new host', async function (assert) { assert.expect(1); const count = getHostSetCount(); @@ -141,157 +121,4 @@ module('Acceptance | host-catalogs | host sets', function (hooks) { 'Name is required.' ); }); - - test('can save changes to existing host', async function (assert) { - assert.expect(3); - assert.notEqual(instances.hostSet.name, 'random string'); - await visit(urls.hostSet); - 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.hostSet); - assert.equal( - this.server.schema.hostSets.all().models[0].name, - 'random string' - ); - }); - - test('can cancel changes to existing host', async function (assert) { - assert.expect(2); - await visit(urls.hostSet); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('.rose-form-actions [type="button"]'); - assert.notEqual(instances.hostSet.name, 'random string'); - assert.equal(find('[name="name"]').value, instances.hostSet.name); - }); - - test('saving an existing host set with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/host-sets/: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.hostSet); - 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 host set changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.hostSet.name, 'random string'); - await visit(urls.hostSet); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.hostSet); - try { - await visit(urls.hostSets); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:first-child'); - assert.equal(currentURL(), urls.hostSets); - assert.notEqual( - this.server.schema.hostSets.all().models[0].name, - 'random string' - ); - } - }); - - test('can cancel discard unsaved host set changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.hostSet.name, 'random string'); - await visit(urls.hostSet); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.hostSet); - try { - await visit(urls.hostSets); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:last-child'); - assert.equal(currentURL(), urls.hostSet); - assert.notEqual( - this.server.schema.hostSets.all().models[0].name, - 'random string' - ); - } - }); - - test('can delete host', async function (assert) { - assert.expect(1); - const count = getHostSetCount(); - await visit(urls.hostSet); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getHostSetCount(), count - 1); - }); - - test('can accept delete host set 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 = getHostSetCount(); - await visit(urls.hostSet); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getHostSetCount(), count - 1); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('cannot cancel delete host set 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 = getHostSetCount(); - await visit(urls.hostSet); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getHostSetCount(), count); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('deleting a host set which errors displays error messages', async function (assert) { - assert.expect(1); - this.server.del('/host-sets/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.hostSet); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.'); - }); }); From 4659b54e9e33905dbdb9d3e6c988767585e534c6 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:52:27 -0400 Subject: [PATCH 27/36] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20ui-level=20n?= =?UTF-8?q?avigation=20ability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/abilities/collection.js | 30 +++++++++++++++++++ .../tests/unit/abilities/collection-test.js | 29 ++++++++++++++++++ ui/desktop/app/abilities/collection.js | 30 +++++++++++++++++++ .../tests/unit/abilities/collection-test.js | 29 ++++++++++++++++++ 4 files changed, 118 insertions(+) create mode 100644 ui/admin/app/abilities/collection.js create mode 100644 ui/admin/tests/unit/abilities/collection-test.js create mode 100644 ui/desktop/app/abilities/collection.js create mode 100644 ui/desktop/tests/unit/abilities/collection-test.js diff --git a/ui/admin/app/abilities/collection.js b/ui/admin/app/abilities/collection.js new file mode 100644 index 000000000..c40786021 --- /dev/null +++ b/ui/admin/app/abilities/collection.js @@ -0,0 +1,30 @@ +import CollectionAbility from 'api/abilities/collection'; +import { inject as service } from '@ember/service'; + +export default class OverrideModelAbility extends CollectionAbility { + // =services + + @service features; + + // =permissions + + /** + * Navigating to a resource is allowed if either list or create grants + * are present. + * @type {boolean} + */ + get canNavigate() { + return this.canList || this.canCreate; + } + + // =methods + + /** + * If the capabilities feature flag is disabled, actions are always + * authorized. This mimics pre-capabilities behavior. + */ + hasAuthorizedCollectionAction() { + if (!this.features.isEnabled('capabilities')) return true; + return super.hasAuthorizedCollectionAction(...arguments); + } +} diff --git a/ui/admin/tests/unit/abilities/collection-test.js b/ui/admin/tests/unit/abilities/collection-test.js new file mode 100644 index 000000000..586eb52b4 --- /dev/null +++ b/ui/admin/tests/unit/abilities/collection-test.js @@ -0,0 +1,29 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Abilities | Collection', function (hooks) { + setupTest(hooks); + + test('it reflects when a resource may be navigated to based on list and create actions', function (assert) { + assert.expect(4); + const service = this.owner.lookup('service:can'); + const model = { + authorized_collection_actions: { foobars: [] }, + }; + assert.notOk( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['list']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['create']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['list', 'create']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + }); +}); diff --git a/ui/desktop/app/abilities/collection.js b/ui/desktop/app/abilities/collection.js new file mode 100644 index 000000000..c40786021 --- /dev/null +++ b/ui/desktop/app/abilities/collection.js @@ -0,0 +1,30 @@ +import CollectionAbility from 'api/abilities/collection'; +import { inject as service } from '@ember/service'; + +export default class OverrideModelAbility extends CollectionAbility { + // =services + + @service features; + + // =permissions + + /** + * Navigating to a resource is allowed if either list or create grants + * are present. + * @type {boolean} + */ + get canNavigate() { + return this.canList || this.canCreate; + } + + // =methods + + /** + * If the capabilities feature flag is disabled, actions are always + * authorized. This mimics pre-capabilities behavior. + */ + hasAuthorizedCollectionAction() { + if (!this.features.isEnabled('capabilities')) return true; + return super.hasAuthorizedCollectionAction(...arguments); + } +} diff --git a/ui/desktop/tests/unit/abilities/collection-test.js b/ui/desktop/tests/unit/abilities/collection-test.js new file mode 100644 index 000000000..586eb52b4 --- /dev/null +++ b/ui/desktop/tests/unit/abilities/collection-test.js @@ -0,0 +1,29 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Abilities | Collection', function (hooks) { + setupTest(hooks); + + test('it reflects when a resource may be navigated to based on list and create actions', function (assert) { + assert.expect(4); + const service = this.owner.lookup('service:can'); + const model = { + authorized_collection_actions: { foobars: [] }, + }; + assert.notOk( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['list']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['create']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['list', 'create']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + }); +}); From 6cbde9c982e20307ccc02ab7bf78be175a10610e Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:54:12 -0400 Subject: [PATCH 28/36] Update collection.js --- addons/api/addon/abilities/collection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/api/addon/abilities/collection.js b/addons/api/addon/abilities/collection.js index 8cb3ca2d7..ad52afd18 100644 --- a/addons/api/addon/abilities/collection.js +++ b/addons/api/addon/abilities/collection.js @@ -3,7 +3,7 @@ import { Ability } from 'ember-can'; /** * Generic ability provides abilities common to all models in the API. */ -export default class ModelAbility extends Ability { +export default class CollectionAbility extends Ability { // =permissions /** From 4256c7e552b8bbe8cd7843e75df05c1b0a13a9cb Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:54:35 -0400 Subject: [PATCH 29/36] Update collection.js --- ui/desktop/app/abilities/collection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/desktop/app/abilities/collection.js b/ui/desktop/app/abilities/collection.js index c40786021..1da414d43 100644 --- a/ui/desktop/app/abilities/collection.js +++ b/ui/desktop/app/abilities/collection.js @@ -1,7 +1,7 @@ import CollectionAbility from 'api/abilities/collection'; import { inject as service } from '@ember/service'; -export default class OverrideModelAbility extends CollectionAbility { +export default class OverrideCollectionAbility extends CollectionAbility { // =services @service features; From 3c83375d84c3986abbd8ad06f3d20f7f7fcff0b9 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:55:05 -0400 Subject: [PATCH 30/36] Update collection.js --- ui/admin/app/abilities/collection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/app/abilities/collection.js b/ui/admin/app/abilities/collection.js index c40786021..1da414d43 100644 --- a/ui/admin/app/abilities/collection.js +++ b/ui/admin/app/abilities/collection.js @@ -1,7 +1,7 @@ import CollectionAbility from 'api/abilities/collection'; import { inject as service } from '@ember/service'; -export default class OverrideModelAbility extends CollectionAbility { +export default class OverrideCollectionAbility extends CollectionAbility { // =services @service features; From 7c377506c8296a63054ecd4aa0b899eea404845d Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 19 Aug 2021 16:06:47 -0700 Subject: [PATCH 31/36] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20host=20catalog=20c?= =?UTF-8?q?apabilities?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/factories/host-catalog.js | 8 + .../components/form/host-catalog/index.hbs | 16 +- .../host-catalogs/host-catalog/-actions.hbs | 18 +- .../scopes/scope/host-catalogs/index.hbs | 14 +- .../acceptance/host-catalogs/delete-test.js | 126 +++++++++++++ .../acceptance/host-catalogs/read-test.js | 84 +++++++++ .../acceptance/host-catalogs/update-test.js | 170 ++++++++++++++++++ 7 files changed, 414 insertions(+), 22 deletions(-) create mode 100644 ui/admin/tests/acceptance/host-catalogs/delete-test.js create mode 100644 ui/admin/tests/acceptance/host-catalogs/read-test.js create mode 100644 ui/admin/tests/acceptance/host-catalogs/update-test.js diff --git a/addons/api/mirage/factories/host-catalog.js b/addons/api/mirage/factories/host-catalog.js index ffb849668..cd033f7f3 100644 --- a/addons/api/mirage/factories/host-catalog.js +++ b/addons/api/mirage/factories/host-catalog.js @@ -1,7 +1,15 @@ import factory from '../generated/factories/host-catalog'; import { trait } from 'ember-cli-mirage'; +import permissions from '../helpers/permissions'; export default factory.extend({ + authorized_actions: () => + permissions.authorizedActionsFor('host-catalog') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], withChildren: trait({ afterCreate(hostCatalog, server) { const { scope } = hostCatalog; diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs index a0c3230ef..39571b820 100644 --- a/ui/admin/app/components/form/host-catalog/index.hbs +++ b/ui/admin/app/components/form/host-catalog/index.hbs @@ -45,12 +45,12 @@ {{/if}} - - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs index 656eba6ee..bf5fe452e 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs @@ -15,12 +15,14 @@ > {{t 'resources.host-set.actions.create'}} - - - {{t 'resources.host-catalog.actions.delete'}} - + {{#if (can 'delete model' @model)}} + + + {{t 'resources.host-catalog.actions.delete'}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs index dcc1f811c..c118c4035 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs @@ -41,12 +41,14 @@ {{#each @model as |hostCatalog|}} - - {{hostCatalog.displayName}} - + {{#if (can 'read model' hostCatalog)}} + + {{hostCatalog.displayName}} + + {{/if}}

{{hostCatalog.description}}

 diff --git a/ui/admin/tests/acceptance/host-catalogs/delete-test.js b/ui/admin/tests/acceptance/host-catalogs/delete-test.js new file mode 100644 index 000000000..997a559aa --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/delete-test.js @@ -0,0 +1,126 @@ +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 { Response } from 'miragejs'; +import { resolve, reject } from 'rsvp'; +import sinon from 'sinon'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | delete', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + let gethostCatalogCount; + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + newHostCatalog: 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.hostCatalog = this.server.create('host-catalog', { + 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.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.unknownHostCatalog = `${urls.hostCatalogs}/foo`; + urls.newHostCatalog = `${urls.hostCatalogs}/new`; + // Generate resource couner + gethostCatalogCount = () => + this.server.schema.hostCatalogs.all().models.length; + authenticateSession({}); + }); + + test('can delete host catalog', async function (assert) { + assert.expect(1); + const count = gethostCatalogCount(); + await visit(urls.hostCatalog); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(gethostCatalogCount(), count - 1); + }); + + test('cannot delete host catalog without proper authorization', async function (assert) { + assert.expect(1); + instances.hostCatalog.authorized_actions = + instances.hostCatalog.authorized_actions.filter( + (item) => item !== 'delete' + ); + await visit(urls.hostCatalog); + assert.notOk( + find('.rose-layout-page-actions .rose-dropdown-button-danger') + ); + }); + + test('can accept delete host catalog 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 = gethostCatalogCount(); + await visit(urls.hostCatalog); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(gethostCatalogCount(), count - 1); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('cannot cancel delete host catalog 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 = gethostCatalogCount(); + await visit(urls.hostCatalog); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(gethostCatalogCount(), count); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('deleting a host catalog which errors displays error messages', async function (assert) { + assert.expect(1); + this.server.del('/host-catalogs/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.hostCatalog); + 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/host-catalogs/read-test.js b/ui/admin/tests/acceptance/host-catalogs/read-test.js new file mode 100644 index 000000000..1544ad4d3 --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/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, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | read', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + newHostCatalog: 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.hostCatalog = this.server.create('host-catalog', { + 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.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.unknownHostCatalog = `${urls.hostCatalogs}/foo`; + urls.newHostCatalog = `${urls.hostCatalogs}/new`; + authenticateSession({}); + }); + + test('visiting host catalogs', async function (assert) { + assert.expect(2); + await visit(urls.hostCatalogs); + await a11yAudit(); + assert.equal(currentURL(), urls.hostCatalogs); + await visit(urls.hostCatalog); + await a11yAudit(); + assert.equal(currentURL(), urls.hostCatalog); + }); + + test('cannot navigate to a host catalog form without proper authorization', async function (assert) { + assert.expect(1); + instances.hostCatalog.authorized_actions = + instances.hostCatalog.authorized_actions.filter( + (item) => item !== 'read' + ); + await visit(urls.hostCatalog); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); + + test('visiting an unknown host catalog displays 404 message', async function (assert) { + assert.expect(1); + await visit(urls.unknownHostCatalog); + await a11yAudit(); + assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404'); + }); +}); diff --git a/ui/admin/tests/acceptance/host-catalogs/update-test.js b/ui/admin/tests/acceptance/host-catalogs/update-test.js new file mode 100644 index 000000000..31a795189 --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/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 { Response } from 'miragejs'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | update', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + newHostCatalog: 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.hostCatalog = this.server.create('host-catalog', { + 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.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.unknownHostCatalog = `${urls.hostCatalogs}/foo`; + urls.newHostCatalog = `${urls.hostCatalogs}/new`; + authenticateSession({}); + }); + + test('can save changes to existing host catalog', async function (assert) { + assert.expect(3); + assert.notEqual(instances.hostCatalog.name, 'random string'); + await visit(urls.hostCatalog); + 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.hostCatalog); + assert.equal( + this.server.schema.hostCatalogs.all().models[0].name, + 'random string' + ); + }); + + test('cannot make changes to an existing host catalog without proper authorization', async function (assert) { + assert.expect(1); + instances.hostCatalog.authorized_actions = + instances.hostCatalog.authorized_actions.filter( + (item) => item !== 'update' + ); + await visit(urls.hostCatalog); + assert.notOk(find('.rose-layout-page-actions .rose-button-secondary')); + }); + + test('can cancel changes to existing host catalog', async function (assert) { + assert.expect(2); + await visit(urls.hostCatalog); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('.rose-form-actions [type="button"]'); + assert.notEqual(instances.hostCatalog.name, 'random string'); + assert.equal(find('[name="name"]').value, instances.hostCatalog.name); + }); + + test('saving an existing host catalog with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/host-catalogs/: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.hostCatalog); + 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 host catalog changes via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.hostCatalog.name, 'random string'); + await visit(urls.hostCatalog); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.hostCatalog); + try { + await visit(urls.hostCatalogs); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:first-child'); + assert.equal(currentURL(), urls.hostCatalogs); + assert.notEqual( + this.server.schema.hostCatalogs.all().models[0].name, + 'random string' + ); + } + }); + + test('can cancel discard unsaved host catalog changes via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.hostCatalog.name, 'random string'); + await visit(urls.hostCatalog); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.hostCatalog); + try { + await visit(urls.hostCatalogs); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:last-child'); + assert.equal(currentURL(), urls.hostCatalog); + assert.notEqual( + this.server.schema.hostCatalogs.all().models[0].name, + 'random string' + ); + } + }); +}); From e7db3cb3272bd1b264f902df9c66d7da5f90213a Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 19 Aug 2021 16:17:54 -0700 Subject: [PATCH 32/36] =?UTF-8?q?fix:=20=F0=9F=90=9B=20restructure=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/acceptance/host-catalogs-test.js | 173 ------------------ 1 file changed, 173 deletions(-) diff --git a/ui/admin/tests/acceptance/host-catalogs-test.js b/ui/admin/tests/acceptance/host-catalogs-test.js index 0213bc5ce..fea885978 100644 --- a/ui/admin/tests/acceptance/host-catalogs-test.js +++ b/ui/admin/tests/acceptance/host-catalogs-test.js @@ -2,10 +2,7 @@ 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 { Response } from 'miragejs'; -import { resolve, reject } from 'rsvp'; -import sinon from 'sinon'; import { authenticateSession, // These are left here intentionally for future reference. @@ -63,23 +60,6 @@ module('Acceptance | host-catalogs', function (hooks) { authenticateSession({}); }); - test('visiting host catalogs', async function (assert) { - assert.expect(2); - await visit(urls.hostCatalogs); - await a11yAudit(); - assert.equal(currentURL(), urls.hostCatalogs); - await visit(urls.hostCatalog); - await a11yAudit(); - assert.equal(currentURL(), urls.hostCatalog); - }); - - test('visiting an unknown host catalog displays 404 message', async function (assert) { - assert.expect(1); - await visit(urls.unknownHostCatalog); - await a11yAudit(); - assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404'); - }); - test('can create new host catalogs', async function (assert) { assert.expect(1); const count = gethostCatalogCount(); @@ -131,157 +111,4 @@ module('Acceptance | host-catalogs', function (hooks) { 'Name is required.' ); }); - - test('can save changes to existing host catalog', async function (assert) { - assert.expect(3); - assert.notEqual(instances.hostCatalog.name, 'random string'); - await visit(urls.hostCatalog); - 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.hostCatalog); - assert.equal( - this.server.schema.hostCatalogs.all().models[0].name, - 'random string' - ); - }); - - test('can cancel changes to existing host catalog', async function (assert) { - assert.expect(2); - await visit(urls.hostCatalog); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('.rose-form-actions [type="button"]'); - assert.notEqual(instances.hostCatalog.name, 'random string'); - assert.equal(find('[name="name"]').value, instances.hostCatalog.name); - }); - - test('saving an existing host catalog with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/host-catalogs/: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.hostCatalog); - 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 host catalog changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.hostCatalog.name, 'random string'); - await visit(urls.hostCatalog); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.hostCatalog); - try { - await visit(urls.hostCatalogs); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:first-child'); - assert.equal(currentURL(), urls.hostCatalogs); - assert.notEqual( - this.server.schema.hostCatalogs.all().models[0].name, - 'random string' - ); - } - }); - - test('can cancel discard unsaved host catalog changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.hostCatalog.name, 'random string'); - await visit(urls.hostCatalog); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.hostCatalog); - try { - await visit(urls.hostCatalogs); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:last-child'); - assert.equal(currentURL(), urls.hostCatalog); - assert.notEqual( - this.server.schema.hostCatalogs.all().models[0].name, - 'random string' - ); - } - }); - - test('can delete host catalog', async function (assert) { - assert.expect(1); - const count = gethostCatalogCount(); - await visit(urls.hostCatalog); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(gethostCatalogCount(), count - 1); - }); - - test('can accept delete host catalog 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 = gethostCatalogCount(); - await visit(urls.hostCatalog); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(gethostCatalogCount(), count - 1); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('cannot cancel delete host catalog 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 = gethostCatalogCount(); - await visit(urls.hostCatalog); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(gethostCatalogCount(), count); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('deleting a host catalog which errors displays error messages', async function (assert) { - assert.expect(1); - this.server.del('/host-catalogs/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.hostCatalog); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.'); - }); }); From c3381bc6fcaa2e57f7756cc6d86e700bf3badbce Mon Sep 17 00:00:00 2001 From: dharini Date: Fri, 20 Aug 2021 10:39:58 -0700 Subject: [PATCH 33/36] =?UTF-8?q?fix:=20=F0=9F=90=9B=20add=20else=20block?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs index c118c4035..734825303 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs @@ -48,6 +48,8 @@ > {{hostCatalog.displayName}} + {{else}} + {{hostCatalog.displayName}} {{/if}}

{{hostCatalog.description}}

 From 7d08d69db0e1a9157752773f6cfcbc80a6365744 Mon Sep 17 00:00:00 2001 From: dharini Date: Fri, 20 Aug 2021 10:52:26 -0700 Subject: [PATCH 34/36] =?UTF-8?q?fix:=20=F0=9F=90=9B=20add=20else=20block?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scopes/scope/host-catalogs/host-catalog/hosts/index.hbs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs index 5a31d35cb..262a32a79 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs @@ -20,6 +20,8 @@ > {{host.displayName}} + {{else}} + {{host.displayName}} {{/if}}

{{host.description}}

From 3506b34863e6931d2b6ad5fc017ca317c1e19440 Mon Sep 17 00:00:00 2001 From: dharini Date: Fri, 20 Aug 2021 11:14:21 -0700 Subject: [PATCH 35/36] =?UTF-8?q?fix:=20=F0=9F=90=9B=20add=20else=20block?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs index e9f8d15c4..735dd94e4 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs @@ -19,6 +19,8 @@ > {{hostSet.displayName}} + {{else}} + {{hostSet.displayName}} {{/if}}

{{hostSet.description}}

From 876fc0c71fe1246153b7e9b3bb2df10ec0d755f4 Mon Sep 17 00:00:00 2001 From: dharini Date: Mon, 23 Aug 2021 15:55:20 -0700 Subject: [PATCH 36/36] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20cred=20store=20cap?= =?UTF-8?q?abilities?= 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.'); - }); });