From 87619dc9dcaf9a0053a261002839f22ea3fd52b9 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Fri, 27 Aug 2021 14:43:18 -0400
Subject: [PATCH 1/5] =?UTF-8?q?test:=20=F0=9F=92=8D=20separate=20delete=20?=
 =?UTF-8?q?and=20update=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/tests/acceptance/scopes-test.js      | 155 ----------------
 .../tests/acceptance/scopes/delete-test.js    | 127 +++++++++++++
 .../tests/acceptance/scopes/update-test.js    | 174 ++++++++++++++++++
 3 files changed, 301 insertions(+), 155 deletions(-)
 create mode 100644 ui/admin/tests/acceptance/scopes/delete-test.js
 create mode 100644 ui/admin/tests/acceptance/scopes/update-test.js

diff --git a/ui/admin/tests/acceptance/scopes-test.js b/ui/admin/tests/acceptance/scopes-test.js
index df294416b..87a2e5656 100644
--- a/ui/admin/tests/acceptance/scopes-test.js
+++ b/ui/admin/tests/acceptance/scopes-test.js
@@ -4,8 +4,6 @@ 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.
@@ -202,157 +200,4 @@ module('Acceptance | scopes', function (hooks) {
       'Name is required.'
     );
   });
-
-  test('can save changes to existing scope', async function (assert) {
-    assert.expect(3);
-    assert.notEqual(instances.scopes.org.name, 'random string');
-    await visit(urls.orgScopeEdit);
-    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.orgScopeEdit);
-    assert.equal(
-      this.server.schema.scopes.where({ type: 'org' }).models[0].name,
-      'random string'
-    );
-  });
-
-  test('can cancel changes to existing scope', async function (assert) {
-    assert.expect(2);
-    await visit(urls.orgScopeEdit);
-    await click('form [type="button"]', 'Activate edit mode');
-    await fillIn('[name="name"]', 'random string');
-    await click('.rose-form-actions [type="button"]');
-    assert.notEqual(instances.scopes.org.name, 'random string');
-    assert.equal(find('[name="name"]').value, instances.scopes.org.name);
-  });
-
-  test('saving an existing scope with invalid fields displays error messages', async function (assert) {
-    assert.expect(2);
-    this.server.patch('/scopes/: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.orgScopeEdit);
-    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 scope changes via dialog', async function (assert) {
-    assert.expect(5);
-    const confirmService = this.owner.lookup('service:confirm');
-    confirmService.enabled = true;
-    assert.notEqual(instances.scopes.org.name, 'random string');
-    await visit(urls.orgScopeEdit);
-    await click('form [type="button"]', 'Activate edit mode');
-    await fillIn('[name="name"]', 'random string');
-    assert.equal(currentURL(), urls.orgScopeEdit);
-    try {
-      await visit(urls.globalScope);
-    } catch (e) {
-      assert.ok(find('.rose-dialog'));
-      await click('.rose-dialog-footer button:first-child');
-      assert.equal(currentURL(), urls.globalScope);
-      assert.notEqual(
-        this.server.schema.scopes.where({ type: 'org' }).models[0].name,
-        'random string'
-      );
-    }
-  });
-
-  test('can cancel discard unsaved scope changes via dialog', async function (assert) {
-    assert.expect(5);
-    const confirmService = this.owner.lookup('service:confirm');
-    confirmService.enabled = true;
-    assert.notEqual(instances.scopes.org.name, 'random string');
-    await visit(urls.orgScopeEdit);
-    await click('form [type="button"]', 'Activate edit mode');
-    await fillIn('[name="name"]', 'random string');
-    assert.equal(currentURL(), urls.orgScopeEdit);
-    try {
-      await visit(urls.globalScope);
-    } catch (e) {
-      assert.ok(find('.rose-dialog'));
-      await click('.rose-dialog-footer button:last-child');
-      assert.equal(currentURL(), urls.orgScopeEdit);
-      assert.notEqual(
-        this.server.schema.scopes.where({ type: 'org' }).models[0].name,
-        'random string'
-      );
-    }
-  });
-
-  test('can delete scope', async function (assert) {
-    assert.expect(1);
-    const orgScopeCount = getScopeCount('org');
-    await visit(urls.orgScopeEdit);
-    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
-    assert.equal(getScopeCount('org'), orgScopeCount - 1);
-  });
-
-  test('can accept delete scope 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 orgScopeCount = getScopeCount('org');
-    await visit(urls.orgScopeEdit);
-    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
-    assert.equal(getScopeCount('org'), orgScopeCount - 1);
-    assert.ok(confirmService.confirm.calledOnce);
-  });
-
-  test('cannot cancel delete scope 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 orgScopeCount = getScopeCount('org');
-    await visit(urls.orgScopeEdit);
-    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
-    assert.equal(getScopeCount('org'), orgScopeCount);
-    assert.ok(confirmService.confirm.calledOnce);
-  });
-
-  test('deleting a scope which errors displays error messages', async function (assert) {
-    assert.expect(1);
-    this.server.del('/scopes/:id', () => {
-      return new Response(
-        490,
-        {},
-        {
-          status: 490,
-          code: 'error',
-          message: 'Oops.',
-        }
-      );
-    });
-    await visit(urls.orgScopeEdit);
-    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/scopes/delete-test.js b/ui/admin/tests/acceptance/scopes/delete-test.js
new file mode 100644
index 000000000..1651dd0b6
--- /dev/null
+++ b/ui/admin/tests/acceptance/scopes/delete-test.js
@@ -0,0 +1,127 @@
+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 | scopes | delete', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  let getScopeCount;
+
+  const instances = {
+    scopes: {
+      global: null,
+      org: null,
+      org2: null,
+      project: null,
+      project2: null,
+    },
+  };
+  const urls = {
+    globalScope: null,
+    orgScope: null,
+    org2Scope: null,
+    orgScopeEdit: null,
+    org2ScopeEdit: null,
+    projectScope: null,
+    project2Scope: null,
+    projectScopeEdit: null,
+    project2ScopeEdit: 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.org2 = 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.scopes.project2 = this.server.create('scope', {
+      type: 'project',
+      scope: { id: instances.scopes.org.id, type: 'org' },
+    });
+    // Generate route URLs for resources
+    urls.globalScope = `/scopes/global/scopes`;
+    urls.newOrgScope = `/scopes/global/new`;
+    urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`;
+    urls.org2Scope = `/scopes/${instances.scopes.org2.id}/scopes`;
+    urls.orgScopeEdit = `/scopes/${instances.scopes.org.id}/edit`;
+    urls.org2ScopeEdit = `/scopes/${instances.scopes.org2.id}/edit`;
+    urls.newProjectScope = `/scopes/${instances.scopes.org.id}/new`;
+    urls.projectScope = `/scopes/${instances.scopes.project.id}`;
+    urls.project2Scope = `/scopes/${instances.scopes.project2.id}`;
+    urls.projectScopeEdit = `/scopes/${instances.scopes.project.id}/edit`;
+    urls.project2ScopeEdit = `/scopes/${instances.scopes.project2.id}/edit`;
+    // Generate resource couner
+    getScopeCount = (type) => this.server.schema.scopes.where({ type }).length;
+    authenticateSession({});
+  });
+
+  test('can delete scope', async function (assert) {
+    assert.expect(1);
+    const orgScopeCount = getScopeCount('org');
+    await visit(urls.orgScopeEdit);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.equal(getScopeCount('org'), orgScopeCount - 1);
+  });
+
+  test('can accept delete scope 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 orgScopeCount = getScopeCount('org');
+    await visit(urls.orgScopeEdit);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.equal(getScopeCount('org'), orgScopeCount - 1);
+    assert.ok(confirmService.confirm.calledOnce);
+  });
+
+  test('cannot cancel delete scope 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 orgScopeCount = getScopeCount('org');
+    await visit(urls.orgScopeEdit);
+    await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+    assert.equal(getScopeCount('org'), orgScopeCount);
+    assert.ok(confirmService.confirm.calledOnce);
+  });
+
+  test('deleting a scope which errors displays error messages', async function (assert) {
+    assert.expect(1);
+    this.server.del('/scopes/:id', () => {
+      return new Response(
+        490,
+        {},
+        {
+          status: 490,
+          code: 'error',
+          message: 'Oops.',
+        }
+      );
+    });
+    await visit(urls.orgScopeEdit);
+    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/scopes/update-test.js b/ui/admin/tests/acceptance/scopes/update-test.js
new file mode 100644
index 000000000..1d7a4974b
--- /dev/null
+++ b/ui/admin/tests/acceptance/scopes/update-test.js
@@ -0,0 +1,174 @@
+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 | scopes | update', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  const instances = {
+    scopes: {
+      global: null,
+      org: null,
+      org2: null,
+      project: null,
+      project2: null,
+    },
+  };
+  const urls = {
+    globalScope: null,
+    orgScope: null,
+    org2Scope: null,
+    orgScopeEdit: null,
+    org2ScopeEdit: null,
+    projectScope: null,
+    project2Scope: null,
+    projectScopeEdit: null,
+    project2ScopeEdit: 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.org2 = 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.scopes.project2 = this.server.create('scope', {
+      type: 'project',
+      scope: { id: instances.scopes.org.id, type: 'org' },
+    });
+    // Generate route URLs for resources
+    urls.globalScope = `/scopes/global/scopes`;
+    urls.newOrgScope = `/scopes/global/new`;
+    urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`;
+    urls.org2Scope = `/scopes/${instances.scopes.org2.id}/scopes`;
+    urls.orgScopeEdit = `/scopes/${instances.scopes.org.id}/edit`;
+    urls.org2ScopeEdit = `/scopes/${instances.scopes.org2.id}/edit`;
+    urls.newProjectScope = `/scopes/${instances.scopes.org.id}/new`;
+    urls.projectScope = `/scopes/${instances.scopes.project.id}`;
+    urls.project2Scope = `/scopes/${instances.scopes.project2.id}`;
+    urls.projectScopeEdit = `/scopes/${instances.scopes.project.id}/edit`;
+    urls.project2ScopeEdit = `/scopes/${instances.scopes.project2.id}/edit`;
+    authenticateSession({});
+  });
+
+  test('can save changes to existing scope', async function (assert) {
+    assert.expect(3);
+    assert.notEqual(instances.scopes.org.name, 'random string');
+    await visit(urls.orgScopeEdit);
+    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.orgScopeEdit);
+    assert.equal(
+      this.server.schema.scopes.where({ type: 'org' }).models[0].name,
+      'random string'
+    );
+  });
+
+  test('can cancel changes to existing scope', async function (assert) {
+    assert.expect(2);
+    await visit(urls.orgScopeEdit);
+    await click('form [type="button"]', 'Activate edit mode');
+    await fillIn('[name="name"]', 'random string');
+    await click('.rose-form-actions [type="button"]');
+    assert.notEqual(instances.scopes.org.name, 'random string');
+    assert.equal(find('[name="name"]').value, instances.scopes.org.name);
+  });
+
+  test('saving an existing scope with invalid fields displays error messages', async function (assert) {
+    assert.expect(2);
+    this.server.patch('/scopes/: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.orgScopeEdit);
+    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 scope changes via dialog', async function (assert) {
+    assert.expect(5);
+    const confirmService = this.owner.lookup('service:confirm');
+    confirmService.enabled = true;
+    assert.notEqual(instances.scopes.org.name, 'random string');
+    await visit(urls.orgScopeEdit);
+    await click('form [type="button"]', 'Activate edit mode');
+    await fillIn('[name="name"]', 'random string');
+    assert.equal(currentURL(), urls.orgScopeEdit);
+    try {
+      await visit(urls.globalScope);
+    } catch (e) {
+      assert.ok(find('.rose-dialog'));
+      await click('.rose-dialog-footer button:first-child');
+      assert.equal(currentURL(), urls.globalScope);
+      assert.notEqual(
+        this.server.schema.scopes.where({ type: 'org' }).models[0].name,
+        'random string'
+      );
+    }
+  });
+
+  test('can cancel discard unsaved scope changes via dialog', async function (assert) {
+    assert.expect(5);
+    const confirmService = this.owner.lookup('service:confirm');
+    confirmService.enabled = true;
+    assert.notEqual(instances.scopes.org.name, 'random string');
+    await visit(urls.orgScopeEdit);
+    await click('form [type="button"]', 'Activate edit mode');
+    await fillIn('[name="name"]', 'random string');
+    assert.equal(currentURL(), urls.orgScopeEdit);
+    try {
+      await visit(urls.globalScope);
+    } catch (e) {
+      assert.ok(find('.rose-dialog'));
+      await click('.rose-dialog-footer button:last-child');
+      assert.equal(currentURL(), urls.orgScopeEdit);
+      assert.notEqual(
+        this.server.schema.scopes.where({ type: 'org' }).models[0].name,
+        'random string'
+      );
+    }
+  });
+});

From 0dd0e167835c043212e15946d83ca50c03049805 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 31 Aug 2021 15:03:40 -0400
Subject: [PATCH 2/5] feature: implement scope update capability

---
 addons/api/mirage/factories/scope.js            |  9 +++++++++
 ui/admin/app/components/form/scope/index.hbs    | 14 ++++++++------
 ui/admin/tests/acceptance/scopes/update-test.js |  7 +++++++
 ui/admin/tests/acceptance/users/create-test.js  |  7 ++++---
 ui/admin/tests/acceptance/users/list-test.js    |  6 +++---
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/addons/api/mirage/factories/scope.js b/addons/api/mirage/factories/scope.js
index e9c5ac09f..3c98f27c9 100644
--- a/addons/api/mirage/factories/scope.js
+++ b/addons/api/mirage/factories/scope.js
@@ -1,9 +1,18 @@
 import factory from '../generated/factories/scope';
 import { trait } from 'ember-cli-mirage';
+import permissions from '../helpers/permissions';
 
 export default factory.extend({
   type: 'global',
 
+  authorized_actions: () =>
+    permissions.authorizedActionsFor('scope') || [
+      'no-op',
+      'read',
+      'update',
+      'delete',
+    ],
+
   authorized_collection_actions: () => {
     return {
       users: ['create', 'list'],
diff --git a/ui/admin/app/components/form/scope/index.hbs b/ui/admin/app/components/form/scope/index.hbs
index a0c3230ef..d86d409b3 100644
--- a/ui/admin/app/components/form/scope/index.hbs
+++ b/ui/admin/app/components/form/scope/index.hbs
@@ -46,11 +46,13 @@
     {{/if}}
   </form.textarea>
 
-  <form.actions
-    @disabled={{if @model.cannotSave @model.cannotSave}}
-    @enableEditText={{t 'actions.edit-form'}}
-    @submitText={{t 'actions.save'}}
-    @cancelText={{t 'actions.cancel'}}
-  />
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
 
 </Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/tests/acceptance/scopes/update-test.js b/ui/admin/tests/acceptance/scopes/update-test.js
index 1d7a4974b..4ddb8085d 100644
--- a/ui/admin/tests/acceptance/scopes/update-test.js
+++ b/ui/admin/tests/acceptance/scopes/update-test.js
@@ -83,6 +83,13 @@ module('Acceptance | scopes | update', function (hooks) {
     );
   });
 
+  test('cannot save changes to without proper authorization', async function (assert) {
+    assert.expect(1);
+    instances.scopes.org.update({ authorized_actions: [] });
+    await visit(urls.orgScopeEdit);
+    assert.notOk(find('form [type="button"]'));
+  });
+
   test('can cancel changes to existing scope', async function (assert) {
     assert.expect(2);
     await visit(urls.orgScopeEdit);
diff --git a/ui/admin/tests/acceptance/users/create-test.js b/ui/admin/tests/acceptance/users/create-test.js
index 069ca0102..805e3def5 100644
--- a/ui/admin/tests/acceptance/users/create-test.js
+++ b/ui/admin/tests/acceptance/users/create-test.js
@@ -14,14 +14,13 @@ module('Acceptance | users | create', function (hooks) {
   setupApplicationTest(hooks);
   setupMirage(hooks);
 
-  let globalScope;
   let orgScope;
   let orgURL;
   let usersURL;
   let newUserURL;
 
   hooks.beforeEach(function () {
-    globalScope = this.server.create('scope', { id: 'global' });
+    this.server.create('scope', { id: 'global' });
     orgScope = this.server.create(
       'scope',
       {
@@ -58,7 +57,9 @@ module('Acceptance | users | create', function (hooks) {
     assert.expect(2);
     orgScope.authorized_collection_actions.users = [];
     await visit(orgURL);
-    assert.notOk(orgScope.authorized_collection_actions.users.includes('create'));
+    assert.notOk(
+      orgScope.authorized_collection_actions.users.includes('create')
+    );
     assert.notOk(find(`[href="${orgURL}/users"]`));
   });
 
diff --git a/ui/admin/tests/acceptance/users/list-test.js b/ui/admin/tests/acceptance/users/list-test.js
index bf768b334..14709851f 100644
--- a/ui/admin/tests/acceptance/users/list-test.js
+++ b/ui/admin/tests/acceptance/users/list-test.js
@@ -20,14 +20,14 @@ module('Acceptance | users | list', function (hooks) {
     scopes: {
       global: null,
       org: null,
-    }
+    },
   };
 
   const urls = {
     scopes: {
-      org: null
+      org: null,
     },
-    users: null
+    users: null,
   };
 
   hooks.beforeEach(function () {

From 9f28484bd7fcf6820908f9751c0b7181b209fdd9 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Wed, 1 Sep 2021 14:02:27 -0700
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20cred=20store=20creat?=
 =?UTF-8?q?e/list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/api/mirage/factories/scope.js          |  2 +-
 .../routes/scopes/scope/credential-stores.js  | 14 +++-
 .../scopes/scope/credential-stores/index.js   |  9 +-
 ui/admin/app/templates/scopes/scope.hbs       | 15 ++--
 .../scopes/scope/credential-stores/index.hbs  | 50 ++++++++---
 .../create-test.js}                           | 22 +++--
 .../acceptance/credential-store/list-test.js  | 84 +++++++++++++++++++
 7 files changed, 169 insertions(+), 27 deletions(-)
 rename ui/admin/tests/acceptance/{credential-stores-test.js => credential-store/create-test.js} (82%)
 create mode 100644 ui/admin/tests/acceptance/credential-store/list-test.js

diff --git a/addons/api/mirage/factories/scope.js b/addons/api/mirage/factories/scope.js
index e9c5ac09f..1d479d1b1 100644
--- a/addons/api/mirage/factories/scope.js
+++ b/addons/api/mirage/factories/scope.js
@@ -13,7 +13,7 @@ export default factory.extend({
       // sessopms: ['list'],
       // targets: ['create', 'list'],
       // 'host-catalogs': ['create', 'list'],
-      // 'credential-stores': ['create', 'list'],
+      'credential-stores': ['create', 'list'],
     };
   },
 
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores.js b/ui/admin/app/routes/scopes/scope/credential-stores.js
index 8bfce1b1d..d49379fcf 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores.js
@@ -1,4 +1,5 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import loading from 'ember-loading/decorator';
 import { confirm } from 'core/decorators/confirm';
@@ -6,14 +7,21 @@ import { notifySuccess, notifyError } from 'core/decorators/notify';
 
 export default class ScopesScopeCredentialStoresRoute extends Route {
   // =methods
-
+  @service can;
   /**
    * Load all credential stores under current scope
    * @returns {Promise[CredentialStoreModel]}
    */
   async model() {
-    const { id: scope_id } = this.modelFor('scopes.scope');
-    return this.store.query('credential-store', { scope_id });
+    const scope = this.modelFor('scopes.scope');
+    const { id: scope_id } = scope;
+    if (
+      this.can.can('list collection', scope, {
+        collection: 'credential-stores',
+      })
+    ) {
+      return this.store.query('credential-store', { scope_id });
+    }
   }
 
   // =actions
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/index.js b/ui/admin/app/routes/scopes/scope/credential-stores/index.js
index 99ced4658..57fea4b74 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/index.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/index.js
@@ -1,3 +1,10 @@
 import Route from '@ember/routing/route';
+export default class ScopesScopeCredentialStoresIndexRoute extends Route {
+  // =methods
 
-export default class ScopesScopeCredentialStoresIndexRoute extends Route {}
+  setupController(controller) {
+    const scope = this.modelFor('scopes.scope');
+    super.setupController(...arguments);
+    controller.setProperties({ scope });
+  }
+}
diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs
index fd20ca2a2..3a2745d60 100644
--- a/ui/admin/app/templates/scopes/scope.hbs
+++ b/ui/admin/app/templates/scopes/scope.hbs
@@ -83,11 +83,16 @@
             <Rose::Icon @name='app-icons/host-catalogs' @size='medium' />
             {{t 'resources.host-catalog.title_plural'}}
           </nav.link>
-          {{#if (feature-flag 'credential-store')}}
-            <nav.link @route='scopes.scope.credential-stores'>
-              <Rose::Icon @name='app-icons/credentials' @size='medium' />
-              {{t 'resources.credential-store.title_plural'}}
-            </nav.link>
+          {{#if
+            (can 'navigate collection' @model collection='credential-stores')
+          }}
+            {{#if (feature-flag 'credential-store')}}
+
+              <nav.link @route='scopes.scope.credential-stores'>
+                <Rose::Icon @name='app-icons/credentials' @size='medium' />
+                {{t 'resources.credential-store.title_plural'}}
+              </nav.link>
+            {{/if}}
           {{/if}}
         </Rose::Nav::Sidebar>
       {{/if}}
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 faa489b0b..6dd0d281f 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs
@@ -14,13 +14,16 @@
   </page.header>
 
   <page.actions>
-    {{#if @model}}
-      <Rose::LinkButton
-        @route='scopes.scope.credential-stores.new'
-        @style='primary'
-      >
-        {{t 'titles.new'}}
-      </Rose::LinkButton>
+
+    {{#if (can 'create collection' this.scope collection='credential-stores')}}
+      {{#if @model}}
+        <Rose::LinkButton
+          @route='scopes.scope.credential-stores.new'
+          @style='primary'
+        >
+          {{t 'titles.new'}}
+        </Rose::LinkButton>
+      {{/if}}
     {{/if}}
   </page.actions>
 
@@ -79,12 +82,35 @@
           as |message|
         >
           <message.description>
-            {{t 'resources.credential-store.description'}}
+            {{#if
+              (can 'list collection' this.scope collection='credential-stores')
+            }}
+              {{! can list (at least):  show default welcome message}}
+              {{t 'resources.credential-store.description'}}
+            {{else if (can
+              'create collection' this.scope collection='credential-stores'
+            )}}
+              {{! can create (only):  show create-but-not-list welcome message}}
+              {{t
+                'descriptions.create-but-not-list'
+                resource=(t 'resources.credential-store.title_plural')
+              }}
+            {{else}}
+              {{! can neither list nor create }}
+              {{t
+                'descriptions.neither-list-nor-create'
+                resource=(t 'resources.user.title_plural')
+              }}
+            {{/if}}
           </message.description>
-          <message.link @route='scopes.scope.credential-stores.new'>
-            <Rose::Icon @name='plus-circle-outline' />
-            {{t 'titles.new'}}
-          </message.link>
+          {{#if
+            (can 'create collection' this.scope collection='credential-stores')
+          }}
+            <message.link @route='scopes.scope.credential-stores.new'>
+              <Rose::Icon @name='plus-circle-outline' />
+              {{t 'titles.new'}}
+            </message.link>
+          {{/if}}
         </Rose::Message>
       </Rose::Layout::Centered>
 
diff --git a/ui/admin/tests/acceptance/credential-stores-test.js b/ui/admin/tests/acceptance/credential-store/create-test.js
similarity index 82%
rename from ui/admin/tests/acceptance/credential-stores-test.js
rename to ui/admin/tests/acceptance/credential-store/create-test.js
index 54764b5a3..e651a641b 100644
--- a/ui/admin/tests/acceptance/credential-stores-test.js
+++ b/ui/admin/tests/acceptance/credential-store/create-test.js
@@ -5,7 +5,7 @@ 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', function (hooks) {
+module('Acceptance | credential-stores | create', function (hooks) {
   setupApplicationTest(hooks);
   setupMirage(hooks);
 
@@ -21,7 +21,6 @@ module('Acceptance | credential-stores', function (hooks) {
 
   const urls = {
     globalScope: null,
-    orgScope: null,
     projectScope: null,
     credentialStores: null,
     credentialStore: null,
@@ -45,7 +44,6 @@ module('Acceptance | credential-stores', function (hooks) {
     });
     // 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}`;
@@ -58,7 +56,7 @@ module('Acceptance | credential-stores', function (hooks) {
     authenticateSession({});
   });
 
-  test('can create a new credential stores', async function (assert) {
+  test('Users can create a new credential stores', async function (assert) {
     assert.expect(1);
     const count = getCredentialStoresCount();
     await visit(urls.newCredentialStore);
@@ -67,7 +65,7 @@ module('Acceptance | credential-stores', function (hooks) {
     assert.equal(getCredentialStoresCount(), count + 1);
   });
 
-  test('can cancel create new credential stores', async function (assert) {
+  test('Users can cancel create new credential stores', async function (assert) {
     assert.expect(2);
     const count = getCredentialStoresCount();
     await visit(urls.newCredentialStore);
@@ -77,6 +75,20 @@ module('Acceptance | credential-stores', function (hooks) {
     assert.equal(getCredentialStoresCount(), count);
   });
 
+  test('Users cannot navigate to new credential stores route without proper authorization', async function (assert) {
+    assert.expect(2);
+    instances.scopes.project.authorized_collection_actions[
+      'credential-stores'
+    ] = [];
+    await visit(urls.projectScope);
+    assert.notOk(
+      instances.scopes.project.authorized_collection_actions[
+        'credential-stores'
+      ].includes('create')
+    );
+    assert.notOk(find(`[href="${urls.credentialStores}"]`));
+  });
+
   test('saving a new credential store with invalid fields displays error messages', async function (assert) {
     assert.expect(2);
     this.server.post('/credential-stores', () => {
diff --git a/ui/admin/tests/acceptance/credential-store/list-test.js b/ui/admin/tests/acceptance/credential-store/list-test.js
new file mode 100644
index 000000000..e4d6cda15
--- /dev/null
+++ b/ui/admin/tests/acceptance/credential-store/list-test.js
@@ -0,0 +1,84 @@
+import { module, test } from 'qunit';
+import { visit, find } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
+import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import {
+  authenticateSession,
+  // These are left here intentionally for future reference.
+  //currentSession,
+  //invalidateSession,
+} from 'ember-simple-auth/test-support';
+
+module('Acceptance | credential-stores | list', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  const instances = {
+    scopes: {
+      global: null,
+      org: null,
+      project: null,
+    },
+  };
+
+  const urls = {
+    scopes: {
+      org: null,
+    },
+    projectScope: null,
+    credentialStores: null,
+    credentialStore: null,
+  };
+
+  hooks.beforeEach(function () {
+    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,
+    });
+    urls.projectScope = `/scopes/${instances.scopes.project.id}`;
+    urls.credentialStores = `${urls.projectScope}/credential-stores`;
+    authenticateSession({});
+  });
+
+  test('Users can navigate to credential-stores with proper authorization', async function (assert) {
+    assert.expect(2);
+    await visit(urls.projectScope);
+    assert.ok(
+      instances.scopes.project.authorized_collection_actions[
+        'credential-stores'
+      ].includes('list')
+    );
+    assert.ok(find(`[href="${urls.credentialStores}"]`));
+  });
+
+  test('Users cannot navigate to index without either list or create actions', async function (assert) {
+    assert.expect(2);
+    instances.scopes.project.authorized_collection_actions[
+      'credential-stores'
+    ] = [];
+    await visit(urls.projectScope);
+    assert.notOk(
+      instances.scopes.project.authorized_collection_actions[
+        'credential-stores'
+      ].includes('list')
+    );
+    assert.notOk(find(`[href="${urls.credentialStores}"]`));
+  });
+
+  test('Users can navigate to index with only create action', async function (assert) {
+    assert.expect(1);
+    instances.scopes.project.authorized_collection_actions[
+      'credential-stores'
+    ] = ['create'];
+    await visit(urls.projectScope);
+    assert.ok(find(`[href="${urls.credentialStores}"]`));
+  });
+});

From 6be0a2a17d4d3f772c6e7cffd1002c377045406d Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Thu, 2 Sep 2021 10:58:06 -0400
Subject: [PATCH 4/5] chore: add scope delete capability

---
 ui/admin/app/templates/scopes/scope/edit.hbs  | 38 ++++++++++---------
 .../tests/acceptance/scopes/delete-test.js    |  9 +++++
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/ui/admin/app/templates/scopes/scope/edit.hbs b/ui/admin/app/templates/scopes/scope/edit.hbs
index 9e3898e0f..648a03111 100644
--- a/ui/admin/app/templates/scopes/scope/edit.hbs
+++ b/ui/admin/app/templates/scopes/scope/edit.hbs
@@ -36,25 +36,27 @@
     </Rose::Nav::Tabs>
   </page.navigation>
 
-  <page.actions>
-    <Rose::Dropdown
-      @text='{{t 'actions.manage'}}'
-      @dropdownRight={{true}}
-      as |dropdown|
-    >
-      <dropdown.button
-        @style='danger'
-        @disabled={{@model.canSave}}
-        {{on 'click' (route-action 'delete' @model)}}
+  {{#if (can 'delete model' @model)}}
+    <page.actions>
+      <Rose::Dropdown
+        @text='{{t 'actions.manage'}}'
+        @dropdownRight={{true}}
+        as |dropdown|
       >
-        {{#if @model.isOrg}}
-          {{t 'resources.org.actions.delete'}}
-        {{else}}
-          {{t 'resources.project.actions.delete'}}
-        {{/if}}
-      </dropdown.button>
-    </Rose::Dropdown>
-  </page.actions>
+        <dropdown.button
+          @style='danger'
+          @disabled={{@model.canSave}}
+          {{on 'click' (route-action 'delete' @model)}}
+        >
+          {{#if @model.isOrg}}
+            {{t 'resources.org.actions.delete'}}
+          {{else}}
+            {{t 'resources.project.actions.delete'}}
+          {{/if}}
+        </dropdown.button>
+      </Rose::Dropdown>
+    </page.actions>
+  {{/if}}
 
   <page.body>
     <Form::Scope
diff --git a/ui/admin/tests/acceptance/scopes/delete-test.js b/ui/admin/tests/acceptance/scopes/delete-test.js
index 1651dd0b6..6b35ae24d 100644
--- a/ui/admin/tests/acceptance/scopes/delete-test.js
+++ b/ui/admin/tests/acceptance/scopes/delete-test.js
@@ -83,6 +83,15 @@ module('Acceptance | scopes | delete', function (hooks) {
     assert.equal(getScopeCount('org'), orgScopeCount - 1);
   });
 
+  test('cannot delete scope without proper authorization', async function (assert) {
+    assert.expect(1);
+    instances.scopes.org.update({ authorized_actions: [] });
+    await visit(urls.orgScopeEdit);
+    assert.notOk(
+      find('.rose-layout-page-actions .rose-dropdown-button-danger')
+    );
+  });
+
   test('can accept delete scope via dialog', async function (assert) {
     assert.expect(2);
     const confirmService = this.owner.lookup('service:confirm');

From f8f7831cc3bb3beaf3341ef48621002d8eeab6d6 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Thu, 2 Sep 2021 15:00:44 -0400
Subject: [PATCH 5/5] =?UTF-8?q?test:=20=F0=9F=92=8D=20add=20read=20capabil?=
 =?UTF-8?q?ity=20and=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/core/translations/resources/en-us.yaml |  5 ++
 ui/admin/app/templates/scopes/scope/edit.hbs  | 36 ++++++++----
 ui/admin/tests/acceptance/scopes/read-test.js | 55 +++++++++++++++++++
 3 files changed, 84 insertions(+), 12 deletions(-)
 create mode 100644 ui/admin/tests/acceptance/scopes/read-test.js

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 52bd07d03..4d373e26d 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -346,3 +346,8 @@ credential-library:
       help: The body of the HTTP request the library sends to Vault when requesting credentials. Only allowed when HTTP method is set to POST.
   types:
     vault: Vault
+scope:
+  title: Scope
+  title_plural: Scopes
+  messages:
+    cannot_read: While you do not have permission to read this scope, you may have permission to view resources within it.
diff --git a/ui/admin/app/templates/scopes/scope/edit.hbs b/ui/admin/app/templates/scopes/scope/edit.hbs
index 648a03111..d8f6dc683 100644
--- a/ui/admin/app/templates/scopes/scope/edit.hbs
+++ b/ui/admin/app/templates/scopes/scope/edit.hbs
@@ -28,13 +28,15 @@
     </Copyable>
   </page.header>
 
-  <page.navigation>
-    <Rose::Nav::Tabs as |nav|>
-      <nav.link @route='scopes.scope'>
-        {{t 'titles.details'}}
-      </nav.link>
-    </Rose::Nav::Tabs>
-  </page.navigation>
+  {{#if (can 'read model' @model)}}
+    <page.navigation>
+      <Rose::Nav::Tabs as |nav|>
+        <nav.link @route='scopes.scope'>
+          {{t 'titles.details'}}
+        </nav.link>
+      </Rose::Nav::Tabs>
+    </page.navigation>
+  {{/if}}
 
   {{#if (can 'delete model' @model)}}
     <page.actions>
@@ -59,11 +61,21 @@
   {{/if}}
 
   <page.body>
-    <Form::Scope
-      @model={{@model}}
-      @submit={{route-action 'save' @model}}
-      @cancel={{route-action 'cancel' @model}}
-    />
+    {{#if (can 'read model' @model)}}
+      <Form::Scope
+        @model={{@model}}
+        @submit={{route-action 'save' @model}}
+        @cancel={{route-action 'cancel' @model}}
+      />
+    {{else}}
+      <Rose::Layout::Centered>
+        <Rose::Message as |message|>
+          <message.description>
+            {{t 'resources.scope.messages.cannot_read'}}
+          </message.description>
+        </Rose::Message>
+      </Rose::Layout::Centered>
+    {{/if}}
   </page.body>
 
 </Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/tests/acceptance/scopes/read-test.js b/ui/admin/tests/acceptance/scopes/read-test.js
new file mode 100644
index 000000000..1ddd1e5a4
--- /dev/null
+++ b/ui/admin/tests/acceptance/scopes/read-test.js
@@ -0,0 +1,55 @@
+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 | scopes | read', function (hooks) {
+  setupApplicationTest(hooks);
+  setupMirage(hooks);
+
+  const instances = {
+    scopes: {
+      global: null,
+      org: null,
+    },
+  };
+  const urls = {
+    orgScopeEdit: 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' },
+    });
+    // Generate route URLs for resources
+    urls.orgScopeEdit = `/scopes/${instances.scopes.org.id}/edit`;
+    // Generate resource couner
+    authenticateSession({});
+  });
+
+  test('visiting org scope edit', async function (assert) {
+    assert.expect(2);
+    await visit(urls.orgScopeEdit);
+    await a11yAudit();
+    assert.equal(currentURL(), urls.orgScopeEdit);
+    assert.ok(find('main .rose-form'));
+  });
+
+  test('visiting org scope edit without read permission results in no form displayed', async function (assert) {
+    assert.expect(2);
+    instances.scopes.org.update({ authorized_actions: [] });
+    await visit(urls.orgScopeEdit);
+    assert.equal(currentURL(), urls.orgScopeEdit);
+    assert.notOk(find('main .rose-form'));
+  });
+});