diff --git a/addons/api/mirage/factories/scope.js b/addons/api/mirage/factories/scope.js
index 186d40205..edd0aeb11 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/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/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}}
-
+ {{#if (can 'save model' @model)}}
+
+ {{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/edit.hbs b/ui/admin/app/templates/scopes/scope/edit.hbs
index 9e3898e0f..d8f6dc683 100644
--- a/ui/admin/app/templates/scopes/scope/edit.hbs
+++ b/ui/admin/app/templates/scopes/scope/edit.hbs
@@ -28,40 +28,54 @@
-
-
-
- {{t 'titles.details'}}
-
-
-
+ {{#if (can 'read model' @model)}}
+
+
+
+ {{t 'titles.details'}}
+
+
+
+ {{/if}}
-
-
-
+
- {{#if @model.isOrg}}
- {{t 'resources.org.actions.delete'}}
- {{else}}
- {{t 'resources.project.actions.delete'}}
- {{/if}}
-
-
-
+
+ {{#if @model.isOrg}}
+ {{t 'resources.org.actions.delete'}}
+ {{else}}
+ {{t 'resources.project.actions.delete'}}
+ {{/if}}
+
+
+
+ {{/if}}
-
+ {{#if (can 'read model' @model)}}
+
+ {{else}}
+
+
+
+ {{t 'resources.scope.messages.cannot_read'}}
+
+
+
+ {{/if}}
\ No newline at end of file
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..6b35ae24d
--- /dev/null
+++ b/ui/admin/tests/acceptance/scopes/delete-test.js
@@ -0,0 +1,136 @@
+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('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');
+ 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/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'));
+ });
+});
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..4ddb8085d
--- /dev/null
+++ b/ui/admin/tests/acceptance/scopes/update-test.js
@@ -0,0 +1,181 @@
+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('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);
+ 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'
+ );
+ }
+ });
+});
diff --git a/ui/admin/tests/acceptance/users/create-test.js b/ui/admin/tests/acceptance/users/create-test.js
index 99b715b9b..b69a1f3df 100644
--- a/ui/admin/tests/acceptance/users/create-test.js
+++ b/ui/admin/tests/acceptance/users/create-test.js
@@ -20,6 +20,7 @@ module('Acceptance | users | create', function (hooks) {
let newUserURL;
hooks.beforeEach(function () {
+ this.server.create('scope', { id: 'global' });
orgScope = this.server.create(
'scope',
{
diff --git a/ui/admin/tests/acceptance/users/list-test.js b/ui/admin/tests/acceptance/users/list-test.js
index d453e5b04..ccf1bcf2e 100644
--- a/ui/admin/tests/acceptance/users/list-test.js
+++ b/ui/admin/tests/acceptance/users/list-test.js
@@ -19,7 +19,6 @@ module('Acceptance | users | list', function (hooks) {
global: null,
org: null,
},
- orgScope: null,
};
const urls = {