From 04af1a431fbffbae824e5486ec7bdf3f830e2734 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 31 Aug 2021 19:41:11 -0700 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20sessions=20create=20?= =?UTF-8?q?list=20capabilities?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/factories/scope.js | 2 +- ui/admin/app/templates/scopes/scope.hbs | 10 +++-- ui/admin/jsconfig.json | 1 + ui/admin/tests/acceptance/sessions-test.js | 43 +++++++++++++++++++++- 4 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 ui/admin/jsconfig.json diff --git a/addons/api/mirage/factories/scope.js b/addons/api/mirage/factories/scope.js index e9c5ac09f..afe31e5cd 100644 --- a/addons/api/mirage/factories/scope.js +++ b/addons/api/mirage/factories/scope.js @@ -10,7 +10,7 @@ export default factory.extend({ // groups: ['create', 'list'], // roles: ['create', 'list'], // 'auth-methods': ['create', 'list'], - // sessopms: ['list'], + sessions: ['list'], // targets: ['create', 'list'], // 'host-catalogs': ['create', 'list'], // 'credential-stores': ['create', 'list'], diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs index fd20ca2a2..c0cb0dca7 100644 --- a/ui/admin/app/templates/scopes/scope.hbs +++ b/ui/admin/app/templates/scopes/scope.hbs @@ -71,10 +71,12 @@ --}} - - - {{t 'resources.session.title_plural'}} - + {{#if (can 'navigate collection' @model collection='sessions')}} + + + {{t 'resources.session.title_plural'}} + + {{/if}} {{t 'resources.target.title_plural'}} diff --git a/ui/admin/jsconfig.json b/ui/admin/jsconfig.json new file mode 100644 index 000000000..f408cac8c --- /dev/null +++ b/ui/admin/jsconfig.json @@ -0,0 +1 @@ +{"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/sessions-test.js b/ui/admin/tests/acceptance/sessions-test.js index d5f68ffeb..a5dfa25ff 100644 --- a/ui/admin/tests/acceptance/sessions-test.js +++ b/ui/admin/tests/acceptance/sessions-test.js @@ -15,13 +15,13 @@ import { module('Acceptance | sessions', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); - const instances = { scopes: { global: null, org: null, }, sessions: null, + orgScope: null, }; const urls = { orgScope: null, @@ -31,6 +31,14 @@ module('Acceptance | sessions', function (hooks) { hooks.beforeEach(function () { authenticateSession({}); instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.orgScope = this.server.create( + 'scope', + { + type: 'org', + scope: { id: 'global', type: 'global' }, + }, + 'withChildren' + ); instances.scopes.org = this.server.create('scope', { type: 'org', scope: { id: 'global', type: 'global' }, @@ -66,6 +74,7 @@ module('Acceptance | sessions', function (hooks) { }, 'withAssociations' ); + urls.orgScope = `/scopes/${instances.scopes.project.id}`; urls.sessions = `/scopes/${instances.scopes.project.id}/sessions`; }); @@ -81,6 +90,38 @@ module('Acceptance | sessions', function (hooks) { await visit(urls.sessions); }); + test('Users cannot navigate to sessions without proper authorization', async function (assert) { + assert.expect(2); + instances.scopes.project.authorized_collection_actions.sessions = []; + authenticateSession({}); + later(async () => { + run.cancelTimers(); + assert.notOk( + instances.scopes.project.authorized_collection_actions.sessions.includes( + 'list' + ) + ); + assert.notOk(find(`[href="${urls.sessions}"]`)); + }, 750); + await visit(urls.orgScope); + }); + + test('Users can navigate to sessions with proper authorization', async function (assert) { + assert.expect(2); + instances.scopes.project.authorized_collection_actions.sessions = ['list']; + authenticateSession({}); + later(async () => { + run.cancelTimers(); + assert.ok( + instances.scopes.project.authorized_collection_actions.sessions.includes( + 'list' + ) + ); + assert.ok(find(`[href="${urls.sessions}"]`)); + }, 750); + await visit(urls.orgScope); + }); + test('visiting sessions without users or targets is OK', async function (assert) { assert.expect(2); instances.sessions[0].update({ From 32c69624f90bc3b1aca0e0c9b206dfd414c38e17 Mon Sep 17 00:00:00 2001 From: dharini Date: Tue, 31 Aug 2021 19:49:56 -0700 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=F0=9F=90=9B=20remove=20jsconfig=20f?= =?UTF-8?q?ile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/jsconfig.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 ui/admin/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 From b27fe14dbca2ec2acba743e9b8df52796070eda8 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Wed, 1 Sep 2021 08:47:34 -0700 Subject: [PATCH 3/4] Update create-test.js --- ui/admin/tests/acceptance/users/create-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/admin/tests/acceptance/users/create-test.js b/ui/admin/tests/acceptance/users/create-test.js index fbff7fbee..99b715b9b 100644 --- a/ui/admin/tests/acceptance/users/create-test.js +++ b/ui/admin/tests/acceptance/users/create-test.js @@ -45,14 +45,14 @@ module('Acceptance | users | create', function (hooks) { assert.equal(this.server.db.users.length, usersCount + 1); }); - test('can navigate to new users route with proper authorization', async function (assert) { + test('Users can navigate to new users route with proper authorization', async function (assert) { assert.expect(2); await visit(orgURL); assert.ok(orgScope.authorized_collection_actions.users.includes('create')); assert.ok(find(`[href="${orgURL}/users"]`)); }); - test('cannot navigate to new users route without proper authorization', async function (assert) { + test('Users cannot navigate to new users route without proper authorization', async function (assert) { assert.expect(2); orgScope.authorized_collection_actions.users = []; await visit(orgURL); From e7b553efda26b8b0992bb25110a0b0e65f2345d8 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Wed, 1 Sep 2021 08:48:08 -0700 Subject: [PATCH 4/4] Update list-test.js --- ui/admin/tests/acceptance/users/list-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/users/list-test.js b/ui/admin/tests/acceptance/users/list-test.js index 72a6e35eb..d453e5b04 100644 --- a/ui/admin/tests/acceptance/users/list-test.js +++ b/ui/admin/tests/acceptance/users/list-test.js @@ -47,7 +47,7 @@ module('Acceptance | users | list', function (hooks) { authenticateSession({}); }); - test('can navigate to users with proper authorization', async function (assert) { + test('Users can navigate to users with proper authorization', async function (assert) { assert.expect(2); await visit(orgURL); assert.ok(